James Chen d6f713a31b Merge branch 'sanityzing_code' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-sanityzing_code ... Conflicts: samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h		2013-07-17 17:06:47 +08:00
..
Cpp	Merge branch 'sanityzing_code' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-sanityzing_code	2013-07-17 17:06:47 +08:00
Javascript	issue #2410: [Android] Adding listener for CCDrawNode when application resume from background.	2013-07-17 12:53:30 +08:00
Lua	Merge pull request #3166 from dumganhar/iss2410-blackscreen-android	2013-07-16 23:25:01 -07:00
samples.xcodeproj	[iOS, Mac]Adding jsb_deprecated.js to resource folder for JSB projects.	2013-07-16 15:35:13 +08:00