aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2013-04-05 16:11:53 -0700
committerIan Romanick <ian.d.romanick@intel.com>2013-04-05 19:01:07 -0700
commit4626e6e270f6535b16214c6f56f91116e3e2939d (patch)
treeba1e670be7807e11b81c7da709a076f6e0e14d1d /bin
parentfe72a61382ae1192adf72c53d664bc2a361ad93b (diff)
mesa: Add previously picked commit to .cherry-ignore
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'bin')
-rw-r--r--bin/.cherry-ignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index a622ec1f8f4..f986f3c241c 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -2,3 +2,6 @@ d60da27273d2cdb68bc32cae2ca66718dab15f27 st/mesa: set ctx->Const.MaxSamples = 0,
5c86a728d4f688c0fe7fbf9f4b8f88060b65c4ee r600g: fix htile buffer leak
496928a442cec980b534bc5da2523b3632b21b61 CopyTexImage: Don't check sRGB vs LINEAR for desktop GL
3ee602314fc22054f69ee476f2e1037653d269bc mesa: Allow glGet* queries of MAX_VARYING_COMPONENTS in ES 3
+
+# Already cherry picked without -x
+96b3ca89b153f358de74059151d2b0e8bd884dfa scons: Allows choosing VS 10 or 11.