CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch ... Conflicts: cocos/gui/UIHelper.h		2013-11-06 16:13:10 +08:00
..
cocos2d_libs.xcodeproj	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch	2013-11-06 16:13:10 +08:00
cocos2d_samples.xcodeproj	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch	2013-11-06 16:13:10 +08:00
BuildHelpers.CMakeLists.txt	issue #3113: Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00
Makefile	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
android-build.py	use python script to build template android projects	2013-11-04 16:48:17 +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	[cmake] Update make-all-linux-projects.sh.	2013-11-04 21:03:09 +08:00