summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-11-14 08:46:22 -0800
committerDylan Baker <dylan@pnwbakers.com>2019-11-19 16:54:04 -0800
commit37d13ecca7c33437b53be33eefcf6e66a56bddb5 (patch)
tree7ca0bf116fa267faa239262d2a4dded20ed73dd5
parenta3d52fd4ab812c0041398969ea33e329a333dc0d (diff)
downloadmesa-37d13ecca7c33437b53be33eefcf6e66a56bddb5.tar.gz
mesa-37d13ecca7c33437b53be33eefcf6e66a56bddb5.tar.bz2
mesa-37d13ecca7c33437b53be33eefcf6e66a56bddb5.zip
cherry-ignore: update for 19.3.0-rc4 cycle
-rw-r--r--bin/.cherry-ignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 9071a9a3b86..536410c19f0 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -1,2 +1,6 @@
# This is reverted shortly after landing
4432a2d14d80081d062f7939a950d65ea3a16eed
+
+# This was manually backported
+21be5c8edd3ad156f6cbfbceb96e7939716d9f2c
+4b392ced2d744fccffe95490ff57e6b41033c266