James Chen 0af0ce9032 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 ... Conflicts: cocos/scripting/auto-generated		2014-02-20 15:13:40 +08:00
..
Classes	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1	2014-02-20 15:13:40 +08:00
Resources	closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.	2014-02-18 14:30:51 +08:00
proj.android	samples -> tests	2014-01-31 14:09:28 -08:00
proj.ios	samples -> tests	2014-01-31 14:09:28 -08:00
proj.linux	samples -> tests	2014-01-31 14:09:28 -08:00
proj.mac	samples -> tests	2014-01-31 14:09:28 -08:00
proj.win32	issue #3738, Add game scenario performance test case.	2014-02-10 11:42:15 +08:00
Android.mk	issue #3738, Add game scenario performance test case.	2014-02-10 11:42:15 +08:00
CMakeLists.txt	issue #3738, Add game scenario performance test case.	2014-02-10 11:42:15 +08:00