James Chen 51ba0cbb17 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268		2014-02-10 14:09:57 +08:00
..
test-cpp	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268	2014-02-10 14:09:57 +08:00
test-javascript	issue #3900: Removes the definition of DEBUG. Windows uses _DEBUG .	2014-02-07 16:01:57 +08:00
test-lua	Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268	2014-02-10 11:38:56 +08:00