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
..
Classes	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
Resources/luaScript	issue #1625: Updated EffectsTest.cpp and EffectsTest.lua.	2012-12-27 11:48:46 +08:00
proj.android	issue #1603:change pathes of android codes	2012-12-21 17:28:14 +08:00
proj.ios	issue #1603: Updated TestLua project setting for iOS port.	2012-12-20 21:58:26 +08:00
proj.linux	fixed #1621: fix compilation error of eclipe project.	2012-12-24 11:15:56 +08:00
proj.marmalade	issue #1603: updated blackberry, linux, marmalade project configurations.	2012-12-20 17:47:30 +08:00
proj.win32	Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012	2012-12-29 09:48:22 +08:00
.gitignore	repair linux cli build	2012-12-22 04:14:15 +04:00