mirror of https://github.com/axmolengine/axmol.git
e895d9d073
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input Conflicts: HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/platform/android/Cocos2dJni.cpp tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java tests/test.ios/test.xcodeproj/project.pbxproj tests/test.win32/test.win32.vcproj |
||
---|---|---|
.. | ||
Res | ||
test.airplay | ||
test.android | ||
test.ios | ||
test.win32 | ||
test.wophone | ||
tests | ||
AppDelegate.cpp | ||
AppDelegate.h |