mirror of https://github.com/axmolengine/axmol.git
f2f3aa55bf
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 |
||
---|---|---|
.. | ||
android | ||
blackberry | ||
include | ||
ios | ||
linux | ||
mac | ||
marmalade | ||
proj.blackberry | ||
proj.linux | ||
proj.marmalade | ||
proj.win32 | ||
third_party | ||
win32 |