[GNUnet-SVN] [gnunet] 71/171: Merge remote-tracking branch 'origin/master' into credentials

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit de63d950345774c45b8d36969d6ecf9fee43dd9b
Merge: ab281595e 1c2ab4aa3
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Fri Apr 21 13:36:41 2017 +0200

    Merge remote-tracking branch 'origin/master' into credentials

 doc/man/gnunet-datastore.1                     |   24 +-
 po/POTFILES.in                                 |    5 +-
 po/de.po                                       | 3078 ++++++++++++-----------
 po/es.po                                       | 3165 ++++++++++++------------
 po/fr.po                                       | 3030 +++++++++++------------
 po/sv.po                                       | 3120 ++++++++++++-----------
 po/vi.po                                       | 3129 ++++++++++++-----------
 po/zh_CN.po                                    | 2982 +++++++++++-----------
 src/ats-tests/Makefile.am                      |    3 +-
 src/cadet/cadet_api.c                          |   16 +-
 src/conversation/gnunet-service-conversation.c |    8 +
 src/datastore/gnunet-datastore.c               |  452 +++-
 src/datastore/gnunet-service-datastore.c       |  274 +-
 src/datastore/perf_plugin_datastore.c          |   13 +-
 src/datastore/plugin_datastore_heap.c          |  372 ++-
 src/datastore/plugin_datastore_mysql.c         |  336 ++-
 src/datastore/plugin_datastore_postgres.c      |  219 +-
 src/datastore/plugin_datastore_sqlite.c        |  258 +-
 src/datastore/plugin_datastore_template.c      |   88 +-
 src/datastore/test_plugin_datastore.c          |   76 +-
 src/fs/fs_unindex.c                            |   14 +-
 src/include/gnunet_cadet_service.h             |    2 +-
 src/include/gnunet_datastore_plugin.h          |  112 +-
 src/include/gnunet_disk_lib.h                  |    3 +-
 src/include/gnunet_json_lib.h                  |   11 +
 src/json/json_helper.c                         |   77 +
 src/multicast/Makefile.am                      |   20 +-
 src/multicast/test_multicast_2peers.c          |   20 +-
 src/multicast/test_multicast_multipeer.c       |  436 ++--
 src/namestore/Makefile.am                      |    1 -
 src/secretsharing/Makefile.am                  |    3 +-
 src/testbed/Makefile.am                        |    1 -
 src/util/strings.c                             |    1 +
 33 files changed, 10768 insertions(+), 10581 deletions(-)


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