James Chen 8700d0f64e Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5343		2014-02-14 09:44:06 +08:00
..
2d	Typo fix in CCDevice.mm.	2014-02-14 09:41:06 +08:00
audio	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
base	remove redundant return	2014-02-11 17:05:10 +08:00
editor-support	-fixed formating and small optimizations	2014-02-13 11:39:53 +03:00
gui	GLView improvements	2014-01-23 15:36:55 -08:00
math/kazmath	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
network	Linux websockets support.	2014-02-13 00:53:51 +01:00
physics	closed #3988: fix bug Node::setRotation() moves opposite when node has a physics body.	2014-02-11 17:10:27 +08:00
scripting	Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343	2014-02-14 09:33:42 +08:00
storage	Linux local storage support. Depends on libsqlite3-dev	2014-02-13 00:53:51 +01:00