James Chen 6176076bce Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-ccb-constants		2013-07-27 22:36:14 +08:00
..
Cpp	issue #2430: Moving enum type to class for CCBReader.	2013-07-27 21:44:49 +08:00
Javascript	More warning fixes.	2013-07-27 15:15:54 +08:00
Lua	issue #2404:Add more deprecated function and modify some test sample	2013-07-27 17:20:22 +08:00
samples.xcodeproj	[Mac] Adding resources for SimpleGame.	2013-07-27 10:28:40 +08:00