Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tools
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
..
cxx-generator@ab8a6c0823 fix a type information in CCBAnimationManager 2012-12-10 11:30:07 +08:00
jenkins_scripts issue #1603:delete space when setting language 2012-12-26 10:42:35 +08:00
lua_project_generator Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
tojs Binded more actions to js. 2012-12-27 13:38:48 +08:00
tolua++ issue #1625: Updated lua pkg files. 2012-12-27 11:47:49 +08:00
xcode4_template_generator when user specified 'group' parameter, it should be parsed as an 'int' 2012-11-27 15:11:43 +08:00