Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform/android
History
natural-law 1991a65b0b Merge branch 'master' into iss391 
Conflicts:
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	cocos2dx/proj.wophone/Makefile.ARM
	cocos2dx/proj.wophone/cocos2d-wophone.vcproj
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	tests/test.ios/test.xcodeproj/project.pbxproj
 		2011-03-29 10:20:57 +08:00
..
CCAccelerometer_android.cpp issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
CCAccelerometer_android.h issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
CCApplication_android.cpp issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
CCApplication_android.h issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
CCEGLView_android.cpp issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
CCEGLView_android.h issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
CCFileUtils_android.cpp issue #434,refactor class CCFileUtils on android and ios. 2011-03-26 17:24:37 +08:00
CCImage_android.cpp issue #396 android modified. 2011-03-28 11:09:49 +08:00
CCThread_android.cpp issue #396 android modified. 2011-03-28 11:09:49 +08:00
Cocos2dJni.cpp issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
Cocos2dJni.h Added logic to disable sensors from the c++ code 2011-02-05 20:17:24 -03:00