summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-10 11:17:05 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-02-10 11:17:15 (GMT)
commit0feca72982a5c67c2f43a2bf61e985e44ac550ea (patch)
tree72d68b88aae2d1f88a58ee311f10036b1dbd4fec
parent368c597250a244bab3208980c917c5cad83c30f4 (diff)
parent5e2db1de26c5b5c82c8c779f2d3172388c3f1e51 (diff)
downloaddefinitions-0feca72982a5c67c2f43a2bf61e985e44ac550ea.tar.gz
Merge branch 'baserock/jjardon/weston1693'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-By: James Thomas <james.thomas@codethink.co.uk>
-rw-r--r--strata/wayland-generic.morph4
-rw-r--r--strata/weston-common.morph4
2 files changed, 4 insertions, 4 deletions
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 890489d..164db34 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -13,7 +13,7 @@ chunks:
- name: wayland
morph: strata/wayland-generic/wayland.morph
repo: upstream:wayland
- ref: 339e83aa579569711cd14623ca4b2db46256b766
- unpetrify-ref: 1.6.0
+ ref: 52d971c924d0147d6949096c9cf001d75828a054
+ unpetrify-ref: 1.6.93
build-depends:
- libxkbcommon
diff --git a/strata/weston-common.morph b/strata/weston-common.morph
index 1d5b015..b690966 100644
--- a/strata/weston-common.morph
+++ b/strata/weston-common.morph
@@ -15,7 +15,7 @@ chunks:
- name: weston
morph: strata/weston-common/weston.morph
repo: upstream:weston
- ref: 463b914d4f1efbf5de6d1f45e9037b88a1eb107f
- unpetrify-ref: baserock/weston-1.6.0/tegra
+ ref: 06315ce5b9569e02ec4e7d322d933bc247620aff
+ unpetrify-ref: baserock/weston-1.6.93/tegra
build-depends:
- linux-pam