summaryrefslogtreecommitdiffstats
path: root/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-14 10:50:01 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-14 10:50:01 +0200
commite9dd029f5d00590e1a53e63b0ab805110a10b54c (patch)
tree1126ca5dda925a62be3dc12c99c90e953d08afcf /security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
parent9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (diff)
parent36b8fd734f590eb726ca2e50f8d1ff9cc968b8e1 (diff)
downloadUXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar
UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.gz
UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.lz
UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.xz
UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.zip
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt')
-rw-r--r--security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt9
1 files changed, 0 insertions, 9 deletions
diff --git a/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt b/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
deleted file mode 100644
index 62c2dac0b..000000000
--- a/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Please add a link to the bugzilla bug and patch name that should be re-applied.
-Also, please update any existing links to their actual mozilla-central changeset.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1287426 bug1287426part4.patch
-https://bugzilla.mozilla.org/show_bug.cgi?id=1287426 bug1287426part5.patch
-https://hg.mozilla.org/mozilla-central/rev/7df8d6639971
-https://bugzilla.mozilla.org/show_bug.cgi?id=1287426 bug1287426part7.patch
-https://bugzilla.mozilla.org/show_bug.cgi?id=1273372 bug1273372part2.patch
-https://bugzilla.mozilla.org/show_bug.cgi?id=1273372 bug1273372part3.patch