axmol/samples/Javascript
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
..
CocosDragonJS Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
CrystalCraze Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
MoonWarriors Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
Shared@24c7cad588 Updates js tests to the latest version. 2013-12-23 20:26:13 +08:00
TestJavascript Add SpineTest to TestJavascript 1 2013-12-20 19:20:13 +09:00
WatermelonWithMe Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00