James Chen 0fe73f3a5d Merge pull request #4804 from minggo/android-config ... don't build spine module when build 2d module		2014-01-02 06:53:15 -08:00
..
2d	Merge pull request #4804 from minggo/android-config	2014-01-02 06:53:15 -08:00
audio	openal context not destroy correctly on mac and ios	2013-12-30 08:37:36 +08:00
base	remove move semantic into another pr	2014-01-02 18:32:47 +08:00
editor-support	change interface	2014-01-02 11:07:31 +08:00
gui	Merge pull request #4781 from dumganhar/js-ui-test	2014-01-01 22:44:25 -08:00
math/kazmath	Merge branch 'develop' into arm64	2013-11-04 15:02:35 -08:00
network	fix compiling errors	2014-01-02 21:53:18 +08:00
physics	fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment	2013-12-26 23:55:05 +08:00
scripting	Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop	2014-01-02 06:46:25 -08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00