summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.co.uk>2015-11-05 11:29:44 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-11-05 11:29:44 +0000
commitbfd14ebb0519125190b24301b724985bb72dbded (patch)
treefa38c90b9a9468c526dff67b57bdef677db58dbd
parentec14e6f8fd05999b482e0785d8cd286042c9c254 (diff)
cherry-ignore: ignore a possible wrong nomination
The commit base varies greatly between master and 11.0. It seems that the commit (in it's current form) is not applicable for the branch. Signed-off-by: Emil Velikov <emil.velikov@collabora.co.uk>
-rw-r--r--bin/.cherry-ignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
new file mode 100644
index 00000000000..1b133ecbd11
--- /dev/null
+++ b/bin/.cherry-ignore
@@ -0,0 +1,2 @@
+# The commit base differs greatly between 11.0 and master
+2832ca95ecce064c7d841a3a374c2179f56161be glsl: fix stream qualifier for blocks with an instance name \ No newline at end of file