From 069ade547f1bfca3750fc2cc78e1ce39a6f59c07 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 5 May 2016 14:05:33 +0100 Subject: [PATCH] cherry-ignore: ignore the GetSamplerParameterIuiv{EXT,OES} fixups The functions/extension landed after the branchpoint. Signed-off-by: Emil Velikov --- bin/.cherry-ignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index 9304ac89694..b1bfb780aef 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -1,2 +1,5 @@ # Remove duplicate commit due to vulkan branch merge 9e64a2a8e4821dd637daac54ba83895a490d4790 mesa: Fix generation of git_sha1.h.tmp for gitlinks + +# The functions/extension in question landed after the branchpoint. +be5010c4b8635d0292404ac58ed0436ba6637579 glapi: fix parameter type for GetSamplerParameterIuivEXT() in es_EXT.xml