boyu0 dec749a692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical		2013-10-31 18:20:32 +08:00
..
2d	issue #2771: fix vs compile errors	2013-10-31 18:18:02 +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 vs compile errors	2013-10-31 18:18:02 +08:00
scripting	closed #3093: The last test of OpenglTest crashes on Windows.	2013-10-31 16:27:00 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00