[GNUnet-SVN] [gnunet] 05/15: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

xrs pushed a commit to branch master
in repository gnunet.

commit e8f3e87e15bad4a64e2911c0e70760672d574cff
Merge: 254362f9b a2ac01f46
Author: xrs <address@hidden>
AuthorDate: Sun Mar 12 17:50:29 2017 +0100

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

 src/namecache/Makefile.am                 |   2 +-
 src/namecache/plugin_namecache_sqlite.c   | 215 +++++++++++++++------------
 src/namestore/Makefile.am                 |   1 +
 src/set/gnunet-service-set_intersection.c |   7 +-
 src/set/gnunet-service-set_intersection.h |  79 ++++++++++
 src/set/gnunet-service-set_union.h        | 239 ++++++++++++++++++++++++++++++
 6 files changed, 442 insertions(+), 101 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden