diff options
author | t3sserakt <t3ss@posteo.de> | 2022-03-17 15:12:06 +0100 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2022-03-17 15:12:06 +0100 |
commit | 8d41efc36bec5bc5ec29278a365d5a63d7349084 (patch) | |
tree | 99177b1b5400df5ae7180c2af1f47408cace1034 /contrib | |
parent | 95a1edacccd9b3bf769a144a12d41946d0ac25dc (diff) | |
parent | ea4a5dd6ca3d62f852b5c2de94071b7fc8f0544c (diff) | |
download | gnunet-8d41efc36bec5bc5ec29278a365d5a63d7349084.tar.gz gnunet-8d41efc36bec5bc5ec29278a365d5a63d7349084.zip |
Merge branch 'master' of ssh://git.gnunet.org/gnunet
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/Makefile.am | 1 | ||||
-rw-r--r-- | contrib/conf/uncrustify.cfg | 2 | ||||
m--------- | contrib/gana | 0 | ||||
-rw-r--r-- | contrib/xdg-scheme-handler/README.md | 2 |
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 = \ | |||
206 | docker/README.md \ | 206 | docker/README.md \ |
207 | docker/gnunet.conf \ | 207 | docker/gnunet.conf \ |
208 | benchmark/collect.awk \ | 208 | benchmark/collect.awk \ |
209 | get_version.sh \ | ||
209 | gnunet_infrastructure/handbook_pull.sh \ | 210 | gnunet_infrastructure/handbook_pull.sh \ |
210 | guix.scm \ | 211 | guix.scm \ |
211 | indent_pre-commit \ | 212 | 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 | |||
28 | pos_arith=lead | 28 | pos_arith=lead |
29 | 29 | ||
30 | # Fully parenthesize boolean exprs | 30 | # Fully parenthesize boolean exprs |
31 | mod_full_paren_if_bool=true | 31 | mod_full_paren_if_bool=false |
32 | 32 | ||
33 | # Braces should be on their own line | 33 | # Braces should be on their own line |
34 | nl_fdef_brace=add | 34 | 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 | |||
5 | directory as a privileged user: | 5 | directory as a privileged user: |
6 | 6 | ||
7 | install -Dm644 gnunet-uri.desktop /usr/share/applications/gnunet-uri.desktop | 7 | install -Dm644 gnunet-uri.desktop /usr/share/applications/gnunet-uri.desktop |
8 | update-mime-database /usr/share/applications/ | 8 | update-mime-database /usr/share/mime |