[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of gnunet.org:gnunet

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnunet.

commit 0d8487a744066dce7d097fb91ae0f965033c79ea
Merge: 42e5187e9 e3c63c726
Author: ng0 <address@hidden>
AuthorDate: Wed Oct 25 14:56:08 2017 +0000

    Merge branch 'master' of gnunet.org:gnunet

 src/include/gnunet_scheduler_lib.h | 16 +++++++++++++
 src/util/scheduler.c               | 48 ++++++++++++++++++++++++++------------
 2 files changed, 49 insertions(+), 15 deletions(-)

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