samuele3 367799da0d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated		2013-12-03 15:42:31 +08:00
..
2d	Merge pull request #4411 from martell/cmake	2013-12-02 01:22:57 -08:00
audio	fixed Audio for Linux	2013-12-02 06:37:32 +00:00
base	fix cocos2d-x for vs2013	2013-11-30 08:05:39 +00:00
editor-support	don't create a pool, since it doesn't invoke any iOS dependent codes	2013-11-27 17:43:54 +08:00
gui	Merge pull request #4378 from hulefei/dev_addGuiNamespace	2013-11-26 01:43:36 -08:00
math/kazmath	Merge branch 'develop' into arm64	2013-11-04 15:02:35 -08:00
network	Uses std::unordered_map<> instead of std::map<>	2013-11-21 13:43:59 -08:00
physics	issue #2771: add more joint tests, add some joint api, fix bugs	2013-12-03 12:47:03 +08:00
scripting	issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings	2013-12-03 15:40:59 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00