summaryrefslogtreecommitdiffstats
path: root/patches/patch-chromium.sh
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-06 18:19:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-13 13:46:31 +0100
commit6aa4bb60d7d10e50cb562756ef8210f559b35d1e (patch)
tree9ea64e167416ce6975dd957a56ed8b0e0ace2154 /patches/patch-chromium.sh
parentb6b03a8316cb1777efb05cd851ca0cb3b989597a (diff)
Update chromium patches to apply on current stable (1650)
Change-Id: I3cd2ddc401e67c232c4bcc88d3c20252eece6be3 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'patches/patch-chromium.sh')
-rwxr-xr-xpatches/patch-chromium.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index 3c593c741..9832b2024 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -75,7 +75,6 @@ cd $CHROMIUM_SRC_DIR/third_party/WebKit
echo "Entering $PWD"
git am $PATCH_DIR/0001-Remove-leftovers-from-WebKitSystemInterface.patch
-git am $PATCH_DIR/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch
cd $CHROMIUM_SRC_DIR/third_party/libjingle/source/talk
echo "Entering $PWD"