From 56b32ead899bf78e3f801c8e00996ec52f48f72c Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 22 Mar 2021 21:14:43 +0100
Subject: [PATCH] updates

---
 build.sh | 9 +++++++++
 settings | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 637cbde..7f41a31 100755
--- a/build.sh
+++ b/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
diff --git a/settings b/settings
index c5c75a3..9ba36a9 160000
--- a/settings
+++ b/settings
@@ -1 +1 @@
-Subproject commit c5c75a39dd91a8772255a78493853be6553262b2
+Subproject commit 9ba36a97a914a9ec96860c836d420baacbb3bd66