diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-08 11:09:26 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-08 15:42:17 +0200 |
| commit | 899c5dbbd4042bf98c135da8efd4a31f53777fb4 (patch) | |
| tree | c53f8e6c93e6b29de098744adaf1c911fe3945eb /patches | |
| parent | c931e3a0098c2e428558254f04b743c57f25eca8 (diff) | |
Remove hunks that accidentially ended up in Clang-libcpp patch.
Change-Id: Ib592d8498cabdafda0dc65cf81de4721f139ffc8
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch b/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch index ccb3d7f90..a2a5a2acf 100644 --- a/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch +++ b/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch @@ -45,10 +45,6 @@ Therefore forward declarations must be removed in several places: net/dns/mock_host_resolver.cc | 31 ----- net/dns/mock_host_resolver.h | 32 ++++- net/http/http_auth_cache.h | 144 ++++++++++----------- - third_party/WebKit | 2 +- - tools/grit | 2 +- - tools/gritsettings/resource_ids | 3 + - tools/gyp | 2 +- ui/gfx/image/image_family.h | 23 ++-- webkit/browser/dom_storage/dom_storage_namespace.h | 3 +- webkit/support/weburl_loader_mock_factory.cc | 5 - @@ -807,41 +803,6 @@ index 1d6f2d2..75b379f 100644 } // namespace net #endif // NET_HTTP_HTTP_AUTH_CACHE_H_ -diff --git a/third_party/WebKit b/third_party/WebKit -index 81619ee..111ddfe 160000 ---- a/third_party/WebKit -+++ b/third_party/WebKit -@@ -1 +1 @@ --Subproject commit 81619eeff33e156f163a4ae7b0745b76cc6e2131 -+Subproject commit 111ddfef0a553f8d0a9ab786a44ae3aca1dad875 -diff --git a/tools/grit b/tools/grit -index fbf8c54..c95babe 160000 ---- a/tools/grit -+++ b/tools/grit -@@ -1 +1 @@ --Subproject commit fbf8c54856bccf2d3e2431127ab334ab1dbd619e -+Subproject commit c95babeeea70a71aaabca18924e2471fbb065b84 -diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids -index fdab9ca..ce61195 100644 ---- a/tools/gritsettings/resource_ids -+++ b/tools/gritsettings/resource_ids -@@ -194,6 +194,9 @@ - }, - # This file is generated during the build. - "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": { -+ #"tracing_resources.grd": { -+ #"../out/Release/gen/content/browser/tracing/tracing_resources.grd": { -+ #"gen/content/browser/tracing/tracing_resources.grd": { - "includes": [25750], - }, - "ash/ash_strings.grd": { -diff --git a/tools/gyp b/tools/gyp -index 172357f..9fd5d11 160000 ---- a/tools/gyp -+++ b/tools/gyp -@@ -1 +1 @@ --Subproject commit 172357f39aae2e09793d6b2dddec3b2ce518ff8d -+Subproject commit 9fd5d1137459f9ed029d046faa90dc80ca9857c5 diff --git a/ui/gfx/image/image_family.h b/ui/gfx/image/image_family.h index b2a2c07..902dede 100644 --- a/ui/gfx/image/image_family.h |