summaryrefslogtreecommitdiff
path: root/devel-system-armv7-highbank.morph
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2013-03-01 17:03:49 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2013-03-01 17:03:49 +0000
commitd1a9c35913ed892ebfdd8ddf079038ef56ea1d5d (patch)
treed791202c8f0ca6847f5e2de5761e9cbc6c47da18 /devel-system-armv7-highbank.morph
parent6770e671b26f658b6422120221ea46c0efc9f319 (diff)
parente38c0a68a9bf4f5777a175837826b4c37ec23d06 (diff)
downloaddefinitions-d1a9c35913ed892ebfdd8ddf079038ef56ea1d5d.tar.gz
Merge branch 'jonathan/genivi-baseline-merge-rebase-2'
Reviewed-by: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'devel-system-armv7-highbank.morph')
-rw-r--r--devel-system-armv7-highbank.morph10
1 files changed, 5 insertions, 5 deletions
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index ab735416..0da056f4 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -9,27 +9,27 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "jonathan/genivi-baseline-merge"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "jonathan/genivi-baseline-merge"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "jonathan/genivi-baseline-merge"
},
{
"morph": "bsp-armv7-highbank",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "jonathan/genivi-baseline-merge"
},
{
"morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "jonathan/genivi-baseline-merge"
}
]
}