pandamicro 3de7ed93f9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: cocos/scripting/javascript/bindings/cocos2d_specifics.cpp		2014-01-21 18:18:32 +08:00
..
2d	Merge pull request #5138 from natural-law/develop	2014-01-21 01:51:57 -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	Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int	2014-01-20 15:03:30 +08:00
gui	Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int	2014-01-20 15:03:30 +08:00
math/kazmath	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
network	fix compiling error cause by undefined ssize_t on vs.	2014-01-21 09:52:43 +08:00
physics	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
scripting	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-01-21 18:18:32 +08:00
storage/local-storage	Compilation fixes in LocalStorage. include localStorage.h.	2014-01-20 23:01:44 +08:00