samuele3hu 847b87b297 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler		2013-07-17 14:45:02 +08:00
..
Cpp	issue #2410: [Android] Adding listener for CCDrawNode when application resume from background.	2013-07-17 12:53:30 +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 branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-17 14:45:02 +08:00
samples.xcodeproj	[iOS, Mac]Adding jsb_deprecated.js to resource folder for JSB projects.	2013-07-16 15:35:13 +08:00