summaryrefslogtreecommitdiff
path: root/xfce-system.morph
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2013-10-01 11:47:45 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2013-10-01 11:47:45 +0000
commit4251aff823a82cc412a3f8ea8c089f2dbd9ac8f5 (patch)
treeaa60fe753a9b94b4abb719c5bb085d44d2b8d608 /xfce-system.morph
parent51b664a912139ea73c0cd23099f4db2f44c00339 (diff)
parentda66b3366346a6bfa57cdb67c1fd265b6f1e6790 (diff)
downloadmorphs-4251aff823a82cc412a3f8ea8c089f2dbd9ac8f5.tar.gz
Merge branch 'baserock/jonathanmaw/fixes'
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk> Reviewed-by: Richard Ipsum <richard.ipsum@codethink.co.uk>
Diffstat (limited to 'xfce-system.morph')
-rw-r--r--xfce-system.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/xfce-system.morph b/xfce-system.morph
index 63f7452..63d34c9 100644
--- a/xfce-system.morph
+++ b/xfce-system.morph
@@ -48,11 +48,11 @@ strata:
ref: master
repo: baserock:baserock/morphs
- morph: gtk2
- ref: baserock/xfce-build-rebase-2
+ ref: master
repo: baserock:baserock/morphs
- morph: tools
ref: master
repo: baserock:baserock/morphs
- morph: xfce
- ref: baserock/xfce-build-rebase-2
+ ref: master
repo: baserock:baserock/morphs