James Chen 56340f9555 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize ... Conflicts: cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj		2013-02-28 13:01:45 +08:00
..
CCEventType.h	issue #1181: save render texture when comming to background	2012-06-14 18:37:57 +08:00
CCProtocols.h	issue #1686:synchronize CCLayer.cpp	2013-02-27 18:21:35 +08:00
ccConfig.h	issue #1686: sync to CCLayer	2013-02-27 09:38:30 +08:00
ccMacros.h	CCAssert uses CC_ASSERT directly	2013-01-10 12:26:12 -08:00
ccTypeInfo.h	Fixed compilation errors of blackberry platform.	2012-09-26 11:16:44 +08:00
ccTypes.h	fix typos in doxygen of CCSprite and CCProtocol	2013-01-14 21:51:47 +08:00
cocos2d.h	issue #1753: Upgrading SpiderMonkey to Firefox19.0, iOS works ok.	2013-02-27 15:16:49 +08:00