Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions
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
..
GUI Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
assets-manager use Schedule::performFunctionInCocosThread 2013-12-06 14:15:01 +08:00
physics-nodes issue #2171: Fixing compilation errors for Linux port. 2013-12-17 14:50:40 +08:00
proj.win32 issue #2790: Removes CCSort.h/.cpp from projects. 2013-12-07 14:21:01 +08:00
Android.mk issue #2790: Removes CCSort.h/.cpp from projects. 2013-12-07 14:21:01 +08:00
CMakeLists.txt issue #2790: Removes CCSort.h/.cpp from projects. 2013-12-07 14:21:01 +08:00
ExtensionMacros.h issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
cocos-ext.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00