6 Commits

Author	SHA1	Message	Date
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
pandamicro	fdec552ed7	Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader	2015-06-02 10:08:13 +08:00
Dale Stammen	7623ee390b	disable CURL and AssetsManager for Windows 10 UWP	2015-05-28 13:32:08 -07:00
Dale Stammen	351a898a70	removed CC_PLATFORM_WP8	2015-05-08 09:19:13 -07:00
pandamicro	ec41965add	Add get header and callback for Downloader	2015-04-23 19:07:07 +08:00
pandamicro	a26e91f839	no message	2014-10-09 18:30:39 +08:00