updates

build.sh

@@ -41,6 +41,11 @@ mach_env() {
     echo "mach_env: done."    
 }
 
+git_subs() {
+    git submodule update --recursive
+    git submodule foreach git merge origin master
+}
+
 fetch() {
     echo "fetch: begin."
 
@@ -289,6 +294,10 @@ fi
 
 done_something=0
 
+if [[ "$*" == *git_subs* ]]; then
+    git_subs
+    done_something=1
+fi
 if [[ "$*" == *deps_deb* ]]; then
     deps_deb
     done_something=1

settings

@@ -1 +1 @@
-Subproject commit c5c75a39dd91a8772255a78493853be6553262b2
+Subproject commit 9ba36a97a914a9ec96860c836d420baacbb3bd66