Merge branch 'master' into obi

diff --git a/.gitmodules b/.gitmodules
index e7ffaf4..5f3029f 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "openembedded-core"]
        path = openembedded-core
-       url = http://192.168.102.71/openembedded-core
+       url = git://git.openembedded.org/openembedded-core-contrib
 [submodule "meta-openembedded"]
        path = meta-openembedded
-       url = http://192.168.102.71/meta-openembedded
+       url = git://git.openembedded.org/meta-openembedded-contrib
 [submodule "bitbake"]
        path = bitbake
        url = git://git.openembedded.org/bitbake

diff --git a/meta-openembedded b/meta-openembedded
index 06fbe62..835745d 160000 (submodule)
--- a/meta-openembedded
+++ b/meta-openembedded
@@ -1 +1 @@
-Subproject commit 06fbe62d86587a8d4b44d28593d9eefb12dc98bb
+Subproject commit 835745de3fc9ad367d82a79983ca22f8694cf7ce

diff --git a/openembedded-core b/openembedded-core
index abe2f93..54e1fb3 160000 (submodule)
--- a/openembedded-core
+++ b/openembedded-core
@@ -1 +1 @@
-Subproject commit abe2f93624c779fa30a13a7cad30ce9d3bca0633
+Subproject commit 54e1fb3b69f97be54a08ba5ccf0bb58a1b538000