mirror of https://github.com/axmolengine/axmol.git
4ed2e0d9d2
Conflicts: CHANGELOG cocos/2d/platform/linux/CCApplication.cpp samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp samples/Cpp/HelloCpp/Classes/AppDelegate.cpp samples/Cpp/HelloCpp/Classes/AppMacros.h samples/Cpp/HelloCpp/proj.ios/AppController.mm samples/Cpp/HelloCpp/proj.mac/main.cpp samples/Cpp/SimpleGame/Classes/AppDelegate.cpp samples/Cpp/SimpleGame/proj.ios/AppController.mm samples/Cpp/SimpleGame/proj.mac/main.cpp samples/Cpp/TestCpp/Classes/AppDelegate.h samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp samples/Javascript/CocosDragonJS/proj.ios/AppController.mm samples/Javascript/CocosDragonJS/proj.mac/main.cpp samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp samples/Javascript/CrystalCraze/proj.ios/AppController.mm samples/Javascript/CrystalCraze/proj.mac/main.cpp samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp samples/Javascript/MoonWarriors/proj.ios/AppController.mm samples/Javascript/MoonWarriors/proj.mac/main.cpp samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm samples/Javascript/WatermelonWithMe/proj.mac/main.cpp samples/Lua/HelloLua/Classes/AppDelegate.cpp samples/Lua/HelloLua/proj.ios/AppController.mm samples/Lua/HelloLua/proj.mac/main.cpp |
||
|---|---|---|
| .. | ||
| Cpp | ||
| Javascript | ||
| Lua/HelloLua | ||
| test-cpp | ||
| test-javascript | ||
| test-lua | ||