summaryrefslogtreecommitdiff
path: root/bin/.cherry-ignore
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-03-07 17:50:29 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-03-07 17:50:29 +0000
commitb83333ac5b9eeae24739d47902e3fd75e9cfeaeb (patch)
treed65f7539a2b07ab74a054dac28d9fcf3ea7d3eb1 /bin/.cherry-ignore
parent30079d6846124e9580335393f75464f8b65149fe (diff)
cherry-ignore: ignore a few more commits picked without -x
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'bin/.cherry-ignore')
-rw-r--r--bin/.cherry-ignore11
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index e784b198288..58c07fbf6e6 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -10,3 +10,14 @@
# auxiliary/vl: bring back the VL code for the dri targets
c39dbfdd0f764b1aaa7319b4694e7335692993dd
+
+# mesa: rename format_info.c to format_info.h
+3f6c28f2a976e35128b7a4a513cfa60af00301e1
+# mesa: fix dependency tracking of generated sources
+d22391cb165af4ed2f9a9e5d6233072a432cc969
+# mesa: drop Makefile from get_hash.h dependency list
+2c0f72d5389a9838cc4fbf4cc4f4291aa56c7845
+# mapi: fix *glapi dependency tracking
+fe5fddd7e2df74233a2a02ae021418485f39d11c
+# xmlpool: make sure we ship options.h
+8d8ca64c28170ec7e9ffa01638bcf8fd30a96088