summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2016-09-02 16:23:49 -0500
committerJohn Klug <john.klug@multitech.com>2016-09-02 16:23:49 -0500
commitd090edad956a36ccb36839b7a336620ee2f8f3c4 (patch)
tree15788ca3c7094122b47d465d3a180032ad6473f7 /.gitmodules
parentc68fced3f65fdc657097ce5efe7abe2b8b2ae808 (diff)
downloadmlinux-d090edad956a36ccb36839b7a336620ee2f8f3c4.tar.gz
mlinux-d090edad956a36ccb36839b7a336620ee2f8f3c4.tar.bz2
mlinux-d090edad956a36ccb36839b7a336620ee2f8f3c4.zip
Move meta-mlinux to Conduit_0.1 branch
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 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