From d090edad956a36ccb36839b7a336620ee2f8f3c4 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 2 Sep 2016 16:23:49 -0500 Subject: Move meta-mlinux to Conduit_0.1 branch --- .gitmodules | 4 ++-- layers/meta-mlinux | 2 +- layers/meta-multitech | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index cafd7c5..ca10c3e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,7 +10,7 @@ [submodule "layers/meta-multitech"] path = layers/meta-multitech url = git@gitlab.multitech.net:mirrors/meta-multitech.git - branch = Counduit_0.1 + branch = Conduit_0.1 [submodule "layers/meta-java"] path = layers/meta-java url = git://git.yoctoproject.org/meta-java @@ -23,4 +23,4 @@ [submodule "layers/meta-mlinux"] path = layers/meta-mlinux url = git@gitlab.multitech.net:mirrors/meta-mlinux.git - branch = internal-dev + branch = Conduit_0.1 diff --git a/layers/meta-mlinux b/layers/meta-mlinux index 7c7f115..3183d27 160000 --- a/layers/meta-mlinux +++ b/layers/meta-mlinux @@ -1 +1 @@ -Subproject commit 7c7f115424d07c226ec238980d2f33e02ba6414c +Subproject commit 3183d27dcb8d662dba7c49467960fc9e596dc2cb diff --git a/layers/meta-multitech b/layers/meta-multitech index 1387a8a..6cd53f3 160000 --- a/layers/meta-multitech +++ b/layers/meta-multitech @@ -1 +1 @@ -Subproject commit 1387a8a43a7cdf1d6e2fec1d132ab28d70b1db4b +Subproject commit 6cd53f35ea7a13945510173af684914b707df3d0 -- cgit v1.2.3