samuelhu 7c45ddafe2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2013-10-31 17:22:14 +08:00
..
2d	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager	2013-10-31 17:22:14 +08:00
audio	fix conflicts	2013-10-22 18:36:13 +08:00
base	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-18 15:34:13 +08:00
editor-support	perfect vs-project configuration	2013-10-31 10:51:38 +08:00
gui	perfect vs-project configuration	2013-10-31 10:51:38 +08:00
math/kazmath	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
network	fix conflicts	2013-10-22 18:36:13 +08:00
physics	issue #2771: fix some compile error in win32	2013-10-23 18:52:09 +08:00
scripting	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager	2013-10-31 17:22:14 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00