Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Cpp/HelloCpp
History
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 Added app.icf, development.icf. 2012-12-20 18:29:25 +08:00
proj.android issue #1603:change pathes of android codes 2012-12-21 17:28:14 +08:00
proj.blackberry issue #1603: updated blackberry, linux, marmalade project configurations. 2012-12-20 17:47:30 +08:00
proj.ios issue #1603:make some samples build ok on iOS 2012-12-20 17:20:10 +08:00
proj.linux repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
proj.mac issue #1603:build ok on mac 2012-12-20 18:02:24 +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