minggo ed1cbb94c2 Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager		2013-02-22 11:04:40 +08:00
..
AssetsManagerTest	issue 1489:add AssetsManager	2013-02-22 11:04:09 +08:00
HelloCpp	issue #1733: Marmalade ok.	2013-02-19 18:26:00 +08:00
SimpleGame	Adding execute permissions for list.sh.	2013-02-19 14:21:56 +08:00
TestCpp	Merge pull request #1873 from ThePickleMan/master	2013-02-21 19:02:39 -08:00