diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/net/tools/flip_server/spdy_util.h | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/net/tools/flip_server/spdy_util.h')
-rw-r--r-- | chromium/net/tools/flip_server/spdy_util.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chromium/net/tools/flip_server/spdy_util.h b/chromium/net/tools/flip_server/spdy_util.h index 537053d50bc..6f002000089 100644 --- a/chromium/net/tools/flip_server/spdy_util.h +++ b/chromium/net/tools/flip_server/spdy_util.h @@ -18,4 +18,3 @@ std::string EncodeURL(std::string uri, std::string host, std::string method); } // namespace net #endif // NET_TOOLS_FLIP_SERVER_SPDY_UTIL_H_ - |