bmanGH 7513e8d643 Merge remote-tracking branch 'upstream/develop' into develop ... Conflicts: cocos/scripting/auto-generated tools/bindings-generator		2014-01-20 12:18:36 +08:00
..
2d	Removes unused cast in CCTMXTiledMap.cpp.	2014-01-20 11:13: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	closed #2789: Adds a macro ‘’USE_STD_UNORDERED_MAP” for switching the implementation of Map<K, V> between using std::unordered_map and std::map.	2014-01-20 12:01:40 +08:00
editor-support	GlobalZOrder is used for render priority...	2014-01-18 11:38:06 -08:00
gui	GlobalZOrder is used for render priority...	2014-01-18 11:38:06 -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 remote-tracking branch 'upstream/develop' into develop	2014-01-20 12:18:36 +08:00
storage/local-storage	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00