andyque 07eb0d373c Merge branch 'v3' into mergeExtensionEditBox ... Conflicts: cocos/ui/Android.mk		2014-08-20 09:32:29 +08:00
..
android	mLastTickInNanoSeconds is the renderStart	2014-08-14 17:07:04 +08:00
apple	add	2014-07-29 17:06:43 +08:00
desktop	Merge pull request #7751 from zawasp/win32_minimize	2014-08-15 15:00:13 +08:00
ios	merge extension EditBox to ui module	2014-08-19 10:28:24 +08:00
linux	GLView Hook	2014-07-31 00:53:04 +08:00
mac	GLView Hook	2014-07-31 00:53:04 +08:00
win32	Make CMake More Robust	2014-08-06 15:43:19 +01:00
winrt	* [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res"	2014-08-20 11:54:41 +03:00
wp8	merge v3 into v3_wp8glviewhookpr	2014-08-04 16:49:42 +08:00
wp8-xaml	fix winrt complie error	2014-08-07 18:38:11 +08:00
CCApplicationProtocol.h	Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed	2014-07-11 10:27:00 +08:00
CCCommon.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCDevice.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCFileUtils.cpp	winrt compile fix -addtional	2014-08-08 10:47:14 +08:00
CCFileUtils.h	add	2014-07-29 17:06:43 +08:00
CCGLView.cpp	wp8 GLView Hook	2014-08-02 16:31:16 +08:00
CCGLView.h	GLView modefy additional	2014-08-11 16:55:23 +08:00
CCImage.cpp	separate jpeg, tiff and webp	2014-08-15 14:29:10 +08:00
CCImage.h	separate jpeg, tiff and webp	2014-08-15 14:29:10 +08:00
CCSAXParser.cpp	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCSAXParser.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCThread.cpp	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCThread.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CMakeLists.txt	GLView Hook	2014-07-31 00:53:04 +08:00