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 feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 		2014-04-25 16:20:24 +08:00
..
cpp-template-default Merge branch 'v3' into develop_migrate_math_lib_merge 2014-04-25 16:20:24 +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-25 03:05:26 +00:00