summaryrefslogtreecommitdiff
path: root/strata/mesa-common.morph
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-05-13 09:51:51 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-05-13 09:51:51 +0000
commita1d5011d51f83f6c13916e34a24565435217b885 (patch)
tree29ddff21d533eaa02b0f10f668981435601801de /strata/mesa-common.morph
parent5a10111c049228302e37d495c1a32588a7cc41f6 (diff)
parent0e0a329c086d424452eaa0bfa77e573f77e3b930 (diff)
downloadinfrastructure-a1d5011d51f83f6c13916e34a24565435217b885.tar.gz
Merge remote-tracking branch 'definitions/master'pedro/openssl101t
Change-Id: I3c7b31d2006dafd8b69386cbee41d0d568b348eb
Diffstat (limited to 'strata/mesa-common.morph')
-rw-r--r--strata/mesa-common.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 092ff3ca..e0562a00 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -11,8 +11,8 @@ chunks:
- name: mesa
morph: strata/mesa-common/mesa.morph
repo: upstream:mesa
- ref: 7bcd827806b0816d61122ba3d37dd40178d96d98
- unpetrify-ref: mesa-11.1.2
+ ref: ff9ddb9eb1b3b25f40e71a95bb48421abfcb11d9
+ unpetrify-ref: mesa-11.2.0
- name: libepoxy
repo: upstream:libepoxy
ref: e2c33af5bfcfc9d168f9e776156dd47c33f428b3