CaiWenzhi 4d99736e4a Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed		2014-03-12 17:06:48 +08:00
..
2d	Merge pull request #5708 from Dhilan007/develop_label	2014-03-12 16:46:22 +08:00
audio	Compiles on Android	2014-03-04 16:59:39 -08:00
base	remove script support	2014-03-07 15:12:46 +08:00
editor-support	Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed	2014-03-12 17:06:48 +08:00
math/kazmath	Adds CC_DLL to kazmath for windows compatibility	2014-03-04 18:07:03 -08:00
network	fixed #3868. Add guard check to send method of HttpClient	2014-03-04 10:07:49 +08:00
physics	closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.	2014-03-11 05:09:08 +08:00
scripting/lua-bindings	Merge pull request #5706 from dumganhar/rename-tests	2014-03-12 15:48:29 +08:00
storage	Linux local storage support. Depends on libsqlite3-dev	2014-02-13 00:53:51 +01:00
ui	Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed	2014-03-12 17:06:48 +08:00