James Chen 3f695d1934 Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master		2013-04-10 16:07:54 +08:00
..
AssetsManager	fixed #1489:add namespace to AssetsManager	2013-02-26 16:43:46 +08:00
CCBReader	Fixing a typo.	2013-04-09 18:08:43 +08:00
GUI	Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master	2013-04-10 16:07:54 +08:00
LocalStorage	fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h.	2013-01-07 18:06:53 +08:00
network	Remove tailing newlines from CCLog messaages.	2013-03-16 09:01:21 -07:00
physics_nodes	Add new port: Native Client	2013-03-02 12:15:24 -08:00
proj.blackberry	Updating blackberry project settings.	2013-03-20 18:34:28 +08:00
proj.linux	Fixing compilation errors for linux.	2013-03-20 10:41:20 +08:00
proj.marmalade	Updating project setting of testcpp for Marmalade.	2013-03-19 17:46:49 +08:00
proj.nacl	Use same top level Makefile for nacl and linux builds.	2013-03-06 13:02:55 -08:00
proj.win32	Updating libExtensions.vcxproj.	2013-03-19 17:27:39 +08:00
Android.mk	Adding dependency on CocosDenshion for CocosBuilderReader in Android makefile	2013-03-18 16:06:47 -07: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