boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical		2013-11-02 00:12:14 +08:00
..
cocos2d_libs.xcodeproj	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-11-02 00:12:14 +08:00
cocos2d_samples.xcodeproj	Merge pull request #4058 from samuele3hu/developAssetsManager	2013-11-01 02:50:47 -07:00
Makefile	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
android-build.py	better log	2013-11-01 18:24:34 +08:00
cocos2d-win32.vc2012.sln	issue #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
install-deps-linux.sh	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
make-all-linux-project.sh	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00