Ricardo Quesada 2108ae0c35 Merge pull request #5324 from heliclei/develop ... set prompt for async console commands		2014-02-13 08:05:07 +08:00
..
2d	quick fix for positioning the FPS on non HD	2014-02-13 04:10:23 +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	closed #3833: SceneTest of CocoStudio crashes	2014-01-24 11:50:58 +08: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	fix link error on vs.	2014-01-25 19:41:20 +08: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 branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime	2014-02-11 18:08:14 +08:00
storage/local-storage	[Win32] fix localStorageGetItem crash when column text is NULL.	2014-01-22 17:37:29 +09:00