boyu0 304d636deb Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345		2013-07-29 11:40:18 +08:00
..
Cpp	Merge pull request #3273 from thp/develop-qt5	2013-07-28 16:51:55 -07: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	Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-29 11:40:18 +08:00