samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS ... Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.h		2013-11-12 15:30:36 +08:00
..
2d	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-12 15:30:36 +08:00
audio	remove makefiles	2013-11-11 17:29:48 +08:00
base	issue #2770: fix some warning	2013-11-11 12:49:38 +08:00
editor-support	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-12 15:30:36 +08:00
gui	Merge pull request #4175 from nutty898/develop_nutty_optimizeguireader_3	2013-11-11 17:36:22 -08:00
math/kazmath	Merge branch 'develop' into arm64	2013-11-04 15:02:35 -08:00
network	remove makefiles	2013-11-11 17:29:48 +08:00
physics	calls `delete[]` instead of `delete`	2013-11-11 16:07:46 -08:00
scripting	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-12 15:30:36 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00