kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp		2014-12-04 15:32:25 +08:00
..
cocos2d_libs.xcodeproj	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-04 15:32:25 +08:00
cocos2d_tests.xcodeproj	Merge pull request #9330 from pipu/v3_flatbuffers	2014-12-04 10:06:42 +08:00
winrt	removed old WP8 project files	2014-10-14 14:09:52 -07:00
wp8	added missing libcocos2d project file	2014-10-28 21:02:14 -07:00
android-build.py	Fix generate apk fail	2014-11-27 16:10:52 +08:00
cocos2d-win8.1-universal.sln	added windows 8.1 universal app solution	2014-10-23 07:37:25 -07:00
cocos2d-win32.vc2012.sln	Remove '-' character	2014-10-11 15:53:09 +08:00
cocos2d-wp8.sln	fixed test solution folder names to enable building project using devenv	2014-11-17 11:52:46 -08:00
install-deps-linux.sh	Adds gnutls-dev to linux deps	2014-11-20 12:28:38 -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