diff options
| author | John Klug <john.klug@multitech.com> | 2016-09-02 16:23:49 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2016-09-02 16:23:49 -0500 |
| commit | d090edad956a36ccb36839b7a336620ee2f8f3c4 (patch) | |
| tree | 15788ca3c7094122b47d465d3a180032ad6473f7 | |
| parent | c68fced3f65fdc657097ce5efe7abe2b8b2ae808 (diff) | |
| download | mlinux-d090edad956a36ccb36839b7a336620ee2f8f3c4.tar.gz mlinux-d090edad956a36ccb36839b7a336620ee2f8f3c4.tar.bz2 mlinux-d090edad956a36ccb36839b7a336620ee2f8f3c4.zip | |
Move meta-mlinux to Conduit_0.1 branch
| -rw-r--r-- | .gitmodules | 4 | ||||
| m--------- | layers/meta-mlinux | 0 | ||||
| m--------- | layers/meta-multitech | 0 |
3 files changed, 2 insertions, 2 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 -Subproject 7c7f115424d07c226ec238980d2f33e02ba6414 +Subproject 3183d27dcb8d662dba7c49467960fc9e596dc2c diff --git a/layers/meta-multitech b/layers/meta-multitech -Subproject 1387a8a43a7cdf1d6e2fec1d132ab28d70b1db4 +Subproject 6cd53f35ea7a13945510173af684914b707df3d |