minggo 04bfbdd5a1 fix conflict		2014-08-27 13:50:01 +08:00
..
ControllerManualAdapter	Fixed bugs[Ouya controller]:	2014-07-17 11:09:08 +08:00
java	invoke nativeOnPause after onSurfaceCreated is invoked	2014-08-27 10:13:03 +08:00
jni	remove unneeded codes	2014-08-26 18:19:28 +08:00
Android.mk	GLView Hook	2014-07-31 00:53:04 +08:00
CCApplication.cpp	GLView Hook	2014-07-31 00:53:04 +08:00
CCApplication.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCCommon.cpp	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCDevice.cpp	setKeepScreenOn method	2014-08-19 15:00:58 +04:00
CCFileUtilsAndroid.cpp	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCFileUtilsAndroid.h	Added a function getAssetManager() on CCFileUtilsAndroid	2014-08-06 13:36:04 +09:00
CCGL.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCGLViewImpl.cpp	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
CCGLViewImpl.h	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
CCPlatformDefine.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCStdC.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
javaactivity.cpp	remove unneeded codes	2014-08-26 18:19:28 +08:00