samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS ... Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.h		2013-11-12 15:30:36 +08:00
..
cocos2d_libs.xcodeproj	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-12 15:30:36 +08:00
cocos2d_samples.xcodeproj	issue #2868:Add ccd lua test samples	2013-11-11 17:03:43 +08:00
BuildHelpers.CMakeLists.txt	issue #3113: Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00
android-build.py	fixes for android create	2013-11-11 16:09:32 -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