samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager ... nter # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2014-10-16 10:59:58 +08:00
..
cocos2d_libs.xcodeproj	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager	2014-10-16 10:59:58 +08:00
cocos2d_tests.xcodeproj	Update the related AssetsManagerEx files and related project configure	2014-10-16 10:28:52 +08:00
winrt	removed old WP8 project files	2014-10-14 14:09:52 -07:00
wp8	added updated WP8 shader compiler project files	2014-10-14 16:38:04 -07:00
android-build.py	Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes	2014-10-14 21:34:55 +08:00
cocos2d-win32.vc2012.sln	Remove '-' character	2014-10-11 15:53:09 +08:00
cocos2d-wp8.sln	added new WP8 solution	2014-10-14 16:39:41 -07:00
install-deps-linux.sh	[Linux] Installs libssl-dev package.	2014-02-13 10:08:03 +08: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