minggo d58f21dc76 Merge pull request #2521 from minggo/emscriptenate ... fix conflict of #2050		2013-05-06 23:51:38 -07:00
..
AssetsManager	fixed #1489:add namespace to AssetsManager	2013-02-26 16:43:46 +08:00
CCBReader	fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually	2013-04-23 10:39:59 +08:00
GUI	resolve conflict for #2505	2013-05-07 14:31:00 +08:00
LocalStorage	fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h.	2013-01-07 18:06:53 +08:00
network	Merge pull request #2490 from coolengineer/pull-request-httpclient	2013-05-06 23:44:20 -07: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	Remove LOG prefixes from emscripten makefiles	2013-05-06 21:00:38 -07:00
proj.linux	issue #2075: Updating extensions project for linux, native client and marmalade.	2013-04-24 14:37:22 +08:00
proj.marmalade	issue #2075: Updating extensions project for linux, native client and marmalade.	2013-04-24 14:37:22 +08:00
proj.nacl	issue #2075: Updating extensions project for linux, native client and marmalade.	2013-04-24 14:37:22 +08:00
proj.win32	issue #2075: Adding spinetest in TestCpp for win32.	2013-04-24 14:48:39 +08:00
spine	Fix warnings.	2013-04-29 16:46:48 -07:00
Android.mk	issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.	2013-04-24 13:57:34 +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	Adding spine/spine-cocos2dx.h to cocos-ext.h.	2013-04-24 14:36:11 +08:00