axmol/tests/cpp-tests/Classes/ParticleTest
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
..
ParticleTest.cpp Merge branch 'v3' into develop_migrate_math_lib_merge 2014-04-25 16:20:24 +08:00
ParticleTest.h closed #4573: add ParticleVisibleTest. 2014-03-27 17:06:26 +08:00