Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples
History
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 		2013-12-19 17:05:59 +08:00
..
Cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
Javascript Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
Lua Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CMakeLists.txt issue #3113: [Linux] Adding options for modules. 2013-11-06 19:17:34 +08:00