[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/04: Merge branch 'master' of git+ssh://gnunet.o
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 03/04: Merge branch 'master' of git+ssh://gnunet.org/gnunet |
Date: |
Fri, 27 Jan 2017 17:06:20 +0100 |
This is an automated email from the git hooks/post-receive script.
bart-polot pushed a commit to branch master
in repository gnunet.
commit 263e1a188460cc89c1341422a7338aaf0645b190
Merge: 016df6e36 164e9747a
Author: Bart Polot <address@hidden>
AuthorDate: Fri Jan 27 14:53:21 2017 +0100
Merge branch 'master' of git+ssh://gnunet.org/gnunet
po/POTFILES.in | 10 ++
src/cadet/cadet_protocol.h | 67 ++++++++++---
src/cadet/gnunet-service-cadet-new_connection.c | 119 +++++++++++++++++++++---
src/cadet/gnunet-service-cadet-new_connection.h | 21 ++++-
src/cadet/gnunet-service-cadet-new_core.c | 32 +++++--
src/cadet/gnunet-service-cadet-new_paths.c | 5 -
src/cadet/gnunet-service-cadet-new_tunnels.c | 113 +++++++++++++---------
src/cadet/gnunet-service-cadet-new_tunnels.h | 14 ++-
src/include/gnunet_protocols.h | 19 +++-
src/util/test_container_dll.c | 5 +-
10 files changed, 311 insertions(+), 94 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden