axmol/extensions/CocoStudio
James Chen f403f7d683 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test
Conflicts:
	samples/samples.xcodeproj/project.pbxproj
2013-09-17 23:24:14 +08:00
..
Armature Fixing armature test crash. 2013-09-17 23:03:33 +08:00
Components [dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'. 2013-09-14 09:02:49 +08:00
GUI Modify guy example 2013-09-17 21:19:04 +08:00
Json 1. remove any unused functions. 2013-09-10 11:02:50 +08:00
Reader Modify scene reader 2013-09-16 21:07:11 +08:00