Dhilan007 9b0bab26b6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3		2014-07-10 17:47:16 +08:00
..
android	Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.	2014-07-09 23:03:04 +08:00
apple	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
desktop	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
ios	Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9	2014-07-08 10:56:16 +08:00
linux	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
mac	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
win32	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
winrt	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
wp8	fixing incorrect optimization	2014-07-01 14:57:10 +08:00
wp8-xaml	Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.	2014-07-09 23:03:04 +08:00
CCApplicationProtocol.h	fixed memory leak cause by singleton.	2014-07-08 18:22:48 +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	Bug fix	2014-05-31 00:13:08 +02:00
CCFileUtils.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCGLViewProtocol.cpp	CCLOGINFO compilation fix	2014-06-19 20:59:08 +04:00
CCGLViewProtocol.h	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCImage.cpp	add some comment	2014-06-06 12:09:39 +08:00
CCImage.h	premultiplied alpha for PNG,TGA,WEBP,RAW_DATA	2014-06-03 15:06:15 +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	Squashed commit of the following:	2014-05-16 14:36:00 -07:00