James Chen 36e5da29b0 Merge branch 'master' of https://github.com/ztoky/cocos2d-x into ztoky-master		2013-02-16 13:48:35 +08:00
..
CCBReader	Committing a fix for a potential unaligned memory access crash in CCBReader::readFloat(),	2013-02-06 14:44:15 -08:00
GUI	Merge branch 'master' of https://github.com/ztoky/cocos2d-x into ztoky-master	2013-02-16 13:48:35 +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	issue #1770: Adding webp support for blackberry and marmalade.	2013-02-06 10:52:13 +08:00
proj.linux	issue #1564:work ok on linux	2012-11-26 11:46:37 +08:00
proj.marmalade	add missing defines doc file to marmalade project file	2013-02-06 14:51:10 +01:00
proj.win32	fixed #1634: Added the very first implementation of CCEditBox for Win32.	2013-01-31 14:04:49 +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