samuele3hu 80a6811f9f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler		2013-07-15 10:39:08 +08:00
..
Cpp	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
Javascript	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
Lua	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-15 10:39:08 +08:00
samples.xcodeproj	getInstance() / destroyInstance() are used...	2013-07-11 15:24:23 -07:00