summaryrefslogtreecommitdiff
path: root/bin/.cherry-ignore
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-02-24 12:14:20 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-02-24 12:14:20 +0000
commit8ab5a28bd6ce4d73237ea68859f2643a2ba72186 (patch)
treef9caf8fa1c482511d5275c9ffde4835eb0732e23 /bin/.cherry-ignore
parent4d6bc2c0ff4279501423e631eedc08013c1f9f26 (diff)
cherry-ignore: ignore 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-ignore12
1 files changed, 12 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
new file mode 100644
index 00000000000..e784b198288
--- /dev/null
+++ b/bin/.cherry-ignore
@@ -0,0 +1,12 @@
+# Cherry-picked without -x
+# nir: resolve nir.h dependency list (fix make distcheck)
+556fc4b84df99a1cd4b18c11fb16f7854a948b2a
+
+# nir: add missing header to the sources list
+72e602905dd9d86450a936d5a22bf21758844b38
+
+# configure: rework wayland_scanner handling(fix make distcheck)
+153539bd9d4445b504110958306f00632222f840
+
+# auxiliary/vl: bring back the VL code for the dri targets
+c39dbfdd0f764b1aaa7319b4694e7335692993dd