summaryrefslogtreecommitdiffstats
path: root/patches/patch-chromium.sh
diff options
context:
space:
mode:
Diffstat (limited to 'patches/patch-chromium.sh')
-rwxr-xr-xpatches/patch-chromium.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index 3a9e9278e..c917f87f5 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -65,6 +65,7 @@ git am $PATCH_DIR/0001-Mac-Do-not-modify-the-child-path.patch
git am $PATCH_DIR/0001-Do-not-warn-for-header-hygiene.patch
git am $PATCH_DIR/0001-Build-files-necessary-for-touch-and-gestures.patch
git am $PATCH_DIR/0001-remove-Wno-deprecated-register-from-common.gypi.patch
+git am $PATCH_DIR/0001-Solve-conflicts-when-including-both-QtOpenGL-headers.patch
cd $CHROMIUM_SRC_DIR/third_party/WebKit
echo "Entering $PWD"