James Chen 3c74044929 Merge pull request #5117 from samuele3hu/test-rebase ... close #3626:Add the “override “ keyword		2014-01-17 18:49:33 -08:00
..
2d	Renderer uses a float as a key	2014-01-17 16:08:29 -08:00
audio	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
base	Renderer: When not using VAOs, call...	2014-01-16 15:02:39 -08:00
editor-support	Renderer uses a float as a key	2014-01-17 16:08:29 -08:00
gui	Renderer uses a float as a key	2014-01-17 16:08:29 -08:00
math/kazmath	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
network	Fixes compilation issues on Linux	2014-01-16 21:49:14 -08:00
physics	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
scripting	Merge pull request #5117 from samuele3hu/test-rebase	2014-01-17 18:49:33 -08:00
storage/local-storage	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00