minggo 04bfbdd5a1 fix conflict		2014-08-27 13:50:01 +08:00
..
android	fix conflict	2014-08-27 13:50:01 +08:00
apple	add	2014-07-29 17:06:43 +08:00
desktop	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
ios	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
linux	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
mac	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
win32	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
winrt	+ [WP8] Added method for custom precompiled shader program loading	2014-08-20 12:02:16 +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	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
CCCommon.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCDevice.h	setKeepScreenOn method	2014-08-19 15:00:58 +04: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	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
CCGLView.h	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
CCImage.cpp	fix compiling error on android and fix some coding style	2014-08-21 15:41:05 +08:00
CCImage.h	use macro to control whether to use jpeg, tiff, webp or not	2014-08-21 15:19:26 +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