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
..
AssetsManager	fixed #1489:add namespace to AssetsManager	2013-02-26 16:43:46 +08:00
CCBReader	CCBReader error with generated animations	2013-02-19 12:27:39 +08:00
GUI	Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize	2013-02-28 13:01:45 +08:00
LocalStorage	fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h.	2013-01-07 18:06:53 +08:00
network	Consistent use of CCAssert	2013-01-08 14:11:34 -08:00
physics_nodes	issue #1686:synchronize CCPhysicsSprite.cpp	2013-02-27 16:12:28 +08:00
proj.blackberry	issue #1712: Updating project setting for blackberry.	2013-02-17 16:26:08 +08:00
proj.linux	issue #1733: Updated linux makefile.	2013-02-19 18:06:30 +08:00
proj.marmalade	add missing defines doc file to marmalade project file	2013-02-06 14:51:10 +01:00
proj.win32	Adds AssetsManager support for win32.	2013-02-25 18:03:38 +08:00
Android.mk	issue #1489: update ios libcurl and add android project	2013-02-25 14:33:04 +08:00
ExtensionMacros.h	issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.	2012-09-25 17:26:09 +08:00
cocos-ext.h	fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h.	2013-01-07 18:06:53 +08:00