Ricardo Quesada a74a524eaa Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes		2014-01-16 21:36:22 -08:00
..
2d	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes	2014-01-16 21:36:22 -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	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
gui	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
math/kazmath	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
network	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
physics	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
scripting	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
storage/local-storage	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00