James Chen 0af0ce9032 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 ... Conflicts: cocos/scripting/auto-generated		2014-02-20 15:13:40 +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	move labelttf's platform-dependent code from CCImage to CCDevice	2014-02-13 21:08:43 +08:00
CCApplication.cpp	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
CCApplication.h	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
CCCommon.cpp	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
CCDevice.cpp	[Android] Don't free BitmapDC::_data in BitmapDC's destructor. Remove unused BitmapDC::env.	2014-02-18 11:07:58 +08:00
CCFileUtilsAndroid.cpp	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
CCFileUtilsAndroid.h	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
CCGL.h	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
CCGLView.cpp	glview uses rect instead of size	2014-01-30 20:16:40 -08:00
CCGLView.h	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
CCPlatformDefine.h	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
CCStdC.h	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
nativeactivity.cpp	closed #3540, Solve the bug: Sometimes RenderTexture not drawn after a background/foreground.	2014-02-20 14:43:07 +08:00
nativeactivity.h	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00