[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 04/05: Merge branch 'master' into auction
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 04/05: Merge branch 'master' into auction |
Date: |
Thu, 12 Jan 2017 18:13:35 +0100 |
This is an automated email from the git hooks/post-receive script.
mteich pushed a commit to branch master
in repository gnunet.
commit a707b68b7513df183860c2a6adfbae4995fb68fd
Merge: 84dc6a318 cf287b4ae
Author: Markus Teich <address@hidden>
AuthorDate: Thu Jan 12 17:34:19 2017 +0100
Merge branch 'master' into auction
configure.ac | 6 +
po/POTFILES.in | 15 +-
po/de.po | 710 ++++++++++++++++++---------------
po/es.po | 800 +++++++++++++++++++++-----------------
po/fr.po | 693 ++++++++++++++++++---------------
po/sv.po | 743 +++++++++++++++++++----------------
po/vi.po | 740 +++++++++++++++++++----------------
po/zh_CN.po | 721 ++++++++++++++++++----------------
src/auction/auction.conf | 2 +
src/nat/nat_api_stun.c | 8 +-
src/zonemaster/zonemaster.conf.in | 2 +-
11 files changed, 2441 insertions(+), 1999 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden