James Chen e7452bc912 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2407-class-order		2013-07-17 14:36:55 +08:00
..
Cpp	issue #2407: Updating SpriteTest.cpp, Don't hide virtual override function.	2013-07-17 14:33:15 +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