James Chen 3bdfb82e9c Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox ... Conflicts: samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters		2013-01-30 22:31:19 +08:00
..
CCBReader	Using new API of getting full path for file name.	2013-01-25 20:51:52 +08:00
GUI	Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox	2013-01-30 22:31:19 +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	fixed #1649: Changed return type to const reference for member variable access.	2013-01-14 15:51:53 +08:00
proj.blackberry	Made all projects compiled ok on Blackberry port.	2012-11-30 12:40:47 +08:00
proj.linux	issue #1564:work ok on linux	2012-11-26 11:46:37 +08:00
proj.marmalade	create cocos2dx-ext marmalade project	2012-11-26 20:14:10 +01:00
proj.win32	Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox	2013-01-30 22:31:19 +08:00
Android.mk	fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android.	2013-01-07 17:22:06 +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