axmol/CocosDenshion
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
..
android Compilation fix for Android clang 3.1 2012-12-22 07:58:30 +02:00
blackberry Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
include Fixed compilation errors of blackberry platform. 2012-09-26 11:16:44 +08:00
ios updates CocosDenshion 2012-08-27 08:43:39 -07:00
linux [FIX] testjs 2012-08-02 16:23:31 +08:00
mac Adding Mac support! 2012-07-20 21:23:40 -07:00
marmalade CocosDenshion fix 2012-12-04 11:03:34 +08:00
proj.blackberry Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
proj.linux repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
proj.marmalade Marmalade Support 2012-10-19 16:26:34 +01:00
proj.win32 Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
third_party Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
win32 issue #1399: Renamed 'cocosDeshion' to 'CocosDeshion'. 2012-07-23 10:56:45 +08:00