Rene Klacan f31a258c01 Merge pull request from cocos2d/develop		2013-06-11 01:06:12 +02:00
..
AssetsManager	issue #1859:fix compiling error of AssetsManager.cpp	2013-05-17 09:47:31 +08:00
CCBReader	Updating multi-platform-xxx template for win32.	2013-06-07 12:57:28 +08:00
GUI	Crash fix in CCControlColurPickerTest.	2013-06-09 16:38:37 +08:00
LocalStorage	fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h.	2013-01-07 18:06:53 +08:00
network	issue #2271: fixed memory leak of WebSocket	2013-06-09 15:08:10 +08:00
physics_nodes	Fix CCPhysicsSprite getPosition variants	2013-04-15 07:35:49 -07:00
proj.blackberry	Updating blackberry project configurations.	2013-04-27 14:07:54 +08:00
proj.emscripten	Ability to save/retrieve CCData into/from CCUserDefault	2013-05-29 01:06:41 +01:00
proj.linux	Update spine runtime	2013-06-02 19:59:13 +04:00
proj.marmalade	issue #2103 add more test lua	2013-05-24 11:42:27 +08:00
proj.nacl	Update Makefile	2013-06-02 20:19:12 +04:00
proj.tizen	[Tizen] Add libwebsockets.h, .a and support C++11	2013-06-07 20:14:43 +09:00
proj.win32	Merge branch 'develop' into update-spine-runtime-develop	2013-06-04 13:46:05 +08:00
spine	Merge pull request from cocos2d/develop	2013-06-06 09:42:18 +02:00
Android.mk	Merge branch 'develop' into update-spine-runtime-develop	2013-06-04 13:46:05 +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	Ability to save/retrieve CCData into/from CCUserDefault	2013-05-29 01:06:41 +01:00