Merge branch 'master' of ssh://git.gnunet.org/gnunet

4 files changed, 3 insertions, 2 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 4e7928c7e..e05e9caf9 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -206,6 +206,7 @@ EXTRA_DIST = \
   docker/README.md \
   docker/gnunet.conf \
   benchmark/collect.awk \
+  get_version.sh \
   gnunet_infrastructure/handbook_pull.sh \
   guix.scm \
   indent_pre-commit \
diff --git a/contrib/conf/uncrustify.cfg b/contrib/conf/uncrustify.cfg
index 6ced05d7a..b02ebc4a5 100644
--- a/contrib/conf/uncrustify.cfg
+++ b/contrib/conf/uncrustify.cfg
@@ -28,7 +28,7 @@ ls_code_width=true
 pos_arith=lead
 
 # Fully parenthesize boolean exprs
-mod_full_paren_if_bool=true
+mod_full_paren_if_bool=false
 
 # Braces should be on their own line
 nl_fdef_brace=add
diff --git a/contrib/gana b/contrib/gana
-Subproject 3a71278a2aab67f9a1888af172b507d6e08364c
+Subproject 048ad729b3177a5de1726517bc905e6cd7688d0
diff --git a/contrib/xdg-scheme-handler/README.md b/contrib/xdg-scheme-handler/README.md
index 919ae37f8..07ff87bdc 100644
--- a/contrib/xdg-scheme-handler/README.md
+++ b/contrib/xdg-scheme-handler/README.md
@@ -5,4 +5,4 @@ To register the `gnunet://` URI scheme, launch the following commands from this
 directory as a privileged user:
 
     install -Dm644 gnunet-uri.desktop /usr/share/applications/gnunet-uri.desktop
-    update-mime-database /usr/share/applications/
+    update-mime-database /usr/share/mime