[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 07/45: Merge branch 'identity_abe' into identity_o
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 07/45: Merge branch 'identity_abe' into identity_oidc |
Date: |
Sun, 25 Feb 2018 16:25:11 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 28e046cf5376171ef86300fc1a0097f7e71cb1e6
Merge: c68eae71c 9e486ede0
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Dec 7 13:03:07 2017 +0100
Merge branch 'identity_abe' into identity_oidc
src/cadet/gnunet-service-cadet_paths.c | 5 +++--
src/gns/gnunet-gns-proxy.c | 18 +++++++++++++++---
src/set/gnunet-service-set_union.c | 7 +++----
src/set/gnunet-service-set_union_strata_estimator.c | 6 ++----
4 files changed, 23 insertions(+), 13 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (d4ad64d79 -> 82e4a63b4), gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 04/45: Merge branch 'identity_abe' into identity_oidc, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 01/45: -start oidc, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 06/45: Merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into identity_oidc, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 05/45: -commit broken, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 07/45: Merge branch 'identity_abe' into identity_oidc,
gnunet <=
- [GNUnet-SVN] [gnunet] 03/45: Merge branch 'identity_abe' into identity_oidc, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 02/45: Merge remote-tracking branch 'origin/identity_abe' into identity_oidc, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 10/45: -merge, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 17/45: -fix, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 13/45: -merge, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 09/45: Merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into identity_oidc, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 12/45: -fixed nonce=(null), gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 16/45: -merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into identity_oidc, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 14/45: -add header map to rest handle, gnunet, 2018/02/25
- [GNUnet-SVN] [gnunet] 21/45: -merge, gnunet, 2018/02/25