Update submodule branches and update buildroot

diff --git a/.gitmodules b/.gitmodules
index 9de6b76c004660a26434d416547f230cb016cb3a..29e45be90c61f023e4af18294613715525d1907a 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,12 +4,16 @@
 [submodule "terminal/src/buildroot"]
        path = terminal/src/buildroot
        url = ../buildroot
+       branch = coffee
 [submodule "terminal/src/mt-apps"]
        path = terminal/src/mt-apps
        url = ../mt-apps
+       branch = master
 [submodule "terminal/src/mtbrowser"]
        path = terminal/src/mtbrowser
        url = ../mtbrowser
+       branch = master
 [submodule "terminal/src/qtwebbrowser"]
        path = terminal/src/qtwebbrowser
        url = ../qtwebbrowser
+       branch = coffee

diff --git a/terminal/src/buildroot b/terminal/src/buildroot
index 41318436ec3807c803426169ec21a5705b65b93c..6229f87b73ddf30d70690c266f93eab50c25b936 160000 (submodule)
--- a/terminal/src/buildroot
+++ b/terminal/src/buildroot
@@ -1 +1 @@
-Subproject commit 41318436ec3807c803426169ec21a5705b65b93c
+Subproject commit 6229f87b73ddf30d70690c266f93eab50c25b936