Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/templates
History
Huabing.Xu f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelBMFont.cpp
	tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
 		2014-04-23 14:46:14 +08:00
..
cpp-template-default Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-23 14:46:14 +08:00
lua-template-default Fix lua project template crash on iOS5.1 device 2014-04-18 18:02:40 -07:00
lua-template-runtime Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
cocos2dx_files.json.REMOVED.git-id [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-10 08:40:58 +00:00