Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests/proj.android
History
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 		2014-10-15 13:41:27 +08:00
..
jni Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 2014-10-15 13:41:27 +08:00
res issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
src/org/cocos2dx/cpp_tests OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
.classpath Improved directory structure 2014-04-29 17:37:36 -07:00
.project All tests could run on Android. 2014-03-11 19:10:36 +08:00
AndroidManifest.xml Remove NativeActivity 2014-03-24 19:57:29 -07:00
ant.properties Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
build-cfg.json issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
build.xml TestsDemo -> CppTests. 2014-03-11 19:10:36 +08:00
ndkgdb.sh All tests could run on Android. 2014-03-11 19:10:36 +08:00
proguard-project.txt Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
project.properties reset 2014-09-25 16:07:57 +08:00