Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests
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-empty-test Merge branch 'v3' into develop_migrate_math_lib_merge 2014-04-25 16:20:24 +08:00
cpp-tests Merge branch 'v3' into develop_migrate_math_lib_merge 2014-04-25 16:20:24 +08:00
lua-empty-test Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test 2014-03-27 11:21:20 +08:00
lua-tests Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer 2014-04-25 11:52:32 +08:00