James Chen b0af2667f8 Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole ... Conflicts: cocos/scripting/auto-generated		2013-12-05 12:48:32 +08:00
..
cocos2d_libs.xcodeproj	Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole	2013-12-05 12:48:32 +08:00
cocos2d_samples.xcodeproj	Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole	2013-12-05 12:48:32 +08:00
BuildHelpers.CMakeLists.txt	issue #3113: Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00
android-build.py	add proceed java compilation and generate apk.	2013-11-26 11:58:01 +08:00
cocos2d-win32.vc2012.sln	bind gui and studio.	2013-11-18 16:54:52 +08:00
install-deps-linux.sh	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
win32-msvc-2010-x86.cmd	Setup for testing for every windows user	2013-11-30 09:36:22 +00:00
win32-msvc-2012-x86.cmd	Setup for testing for every windows user	2013-11-30 09:36:22 +00:00
win32-msvc-2013-x86.cmd	Setup for testing for every windows user	2013-11-30 09:36:22 +00:00