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
Ricardo Quesada 4ed2e0d9d2 Merge branch 'develop' into glview_improvements 
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
 		2014-01-28 11:32:25 -08:00
..
java restore it to platform=10 2014-01-27 12:39:24 -08:00
jni update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
Android.mk fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
CCApplication.cpp Added Dutch for 3.x branch 2014-01-25 20:38:15 +00:00
CCApplication.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCCommon.cpp cocos2d::log() moved to CCConsole 2014-01-10 19:04:07 -08:00
CCDevice.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCEGLView.cpp GLView improvements 2014-01-23 15:36:55 -08:00
CCEGLView.h GLView improvements 2014-01-23 15:36:55 -08:00
CCFileUtilsAndroid.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCFileUtilsAndroid.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCGL.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCImage.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCPlatformDefine.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCStdC.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
nativeactivity.cpp Merge branch 'glview_improvements' of github.com:ricardoquesada/cocos2d-x into glview_improvements 2014-01-27 10:53:12 -08:00
nativeactivity.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00