Merge pull request #2199 from ulion/http_proxy_type
authorMartijn Kaijser <machine.sanctum@gmail.com>
Sun, 10 Feb 2013 10:22:32 +0000 (02:22 -0800)
committerMartijn Kaijser <machine.sanctum@gmail.com>
Sun, 10 Feb 2013 10:22:32 +0000 (02:22 -0800)
commitb7f0768ccb651f8cac9b8fa3ceb274535fd5c54a
tree66fd28c2eb0317d2ca7db77b16cfd8a94b555b08
parent6f2276c2fb08562df42ba2166053da009811d410
parentca0ce7c4e4b05eba4569c55093fa0c2b16a74841
Merge pull request #2199 from ulion/http_proxy_type

add gui setting for set proxy types curl supported, so we can support socks4/4a/5/5 with remote dns
language/English/strings.po
xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
xbmc/filesystem/CurlFile.cpp
xbmc/filesystem/CurlFile.h
xbmc/settings/GUISettings.cpp
xbmc/settings/GUIWindowSettingsCategory.cpp