summaryrefslogtreecommitdiff
path: root/.pick_status.json
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-11-21 22:14:50 +0000
committerDylan Baker <dylan.c.baker@intel.com>2020-09-01 13:53:29 -0700
commitfe8d18e75254e7d1c91578ace6a34627ff636ed9 (patch)
tree5556b6e3d27a1892302c4149554467076364c182 /.pick_status.json
parent8f4094bb1c4d178df8ca13db828c76074d42d3ce (diff)
meson: don't advertise TLS support if glx wasn't build with it
Fixes: a47c525f328 ("meson: build glx") Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630> (cherry picked from commit 9ac16864227cc63ca6b23eeab39fdcc7f85beca5)
Diffstat (limited to '.pick_status.json')
-rw-r--r--.pick_status.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index b136d4924ab..6ed95504169 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -922,7 +922,7 @@
"description": "meson: don't advertise TLS support if glx wasn't build with it",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "a47c525f3281a2753180e076c7e9b7772aff8f06"
},