Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d/platform/android
History
bmanGH 537af014d8 Merge branch 'develop' of https://github.com/bmanGH/cocos2d-x into develop 
Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
 		2013-10-17 15:25:46 +08:00
..
java issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
jni issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
Android.mk issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCApplication.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCApplication.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCCommon.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCDevice.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCEGLView.cpp Merge branch 'develop' of https://github.com/bmanGH/cocos2d-x into develop 2013-10-17 15:25:46 +08:00
CCEGLView.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCFileUtilsAndroid.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCFileUtilsAndroid.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCGL.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCImage.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCPlatformDefine.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCStdC.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
nativeactivity.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
nativeactivity.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00