pandamicro 4c6f67fd7e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: tools/bindings-generator web		2015-06-02 10:12:22 +08:00
..
AssetsManager.cpp	Update AssetsManager.cpp	2015-05-16 11:48:34 +08:00
AssetsManager.h	disable CURL and AssetsManager for Windows 10 UWP	2015-05-28 13:32:08 -07:00
AssetsManagerEx.cpp	Add FileUtils::getSuitableFOpen	2015-04-19 14:00:27 +03:00
AssetsManagerEx.h	#9061: Add check for instantiation	2014-11-26 14:39:56 +08:00
CCEventAssetsManagerEx.cpp	Cleanup order of fields initialization.	2014-10-30 17:28:41 +03:00
CCEventAssetsManagerEx.h	no message	2014-10-09 18:30:39 +08:00
CCEventListenerAssetsManagerEx.cpp	no message	2014-10-09 18:30:39 +08:00
CCEventListenerAssetsManagerEx.h	no message	2014-10-09 18:30:39 +08:00
Downloader.cpp	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-06-02 10:12:22 +08:00
Downloader.h	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-06-02 10:12:22 +08:00
Manifest.cpp	check for existance of KEY_DOWNLOAD_STATE entry before trying to read its value	2015-05-28 13:33:38 -07:00
Manifest.h	Update comment for Lua	2015-03-30 15:47:47 +08:00