summaryrefslogtreecommitdiff
path: root/strata/x-generic.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/x-generic.morph
parent5a10111c049228302e37d495c1a32588a7cc41f6 (diff)
parent0e0a329c086d424452eaa0bfa77e573f77e3b930 (diff)
downloadinfrastructure-a1d5011d51f83f6c13916e34a24565435217b885.tar.gz
Merge remote-tracking branch 'definitions/master'pedro/openssl101t
Change-Id: I3c7b31d2006dafd8b69386cbee41d0d568b348eb
Diffstat (limited to 'strata/x-generic.morph')
-rw-r--r--strata/x-generic.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 4d93d770..d9462426 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -29,8 +29,8 @@ chunks:
- name: xserver
morph: strata/x-generic/xserver.morph
repo: upstream:xserver
- ref: 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
- unpetrify-ref: xorg-server-1.18.0
+ ref: 93d4224ccf3dee5a51815a66f76c905450419b50
+ unpetrify-ref: xorg-server-1.18.2
build-depends:
- xorg-font-util
- xorg-lib-libXfont