merge branch 'refactoring-scheduler'

author lurchi <lurchi@strangeplace.net>

Sat, 30 Dec 2017 20:32:59 +0000 (21:32 +0100)

committer lurchi <lurchi@strangeplace.net>

Sat, 30 Dec 2017 20:32:59 +0000 (21:32 +0100)
author lurchi <lurchi@strangeplace.net>
Sat, 30 Dec 2017 20:32:59 +0000 (21:32 +0100)
committer lurchi <lurchi@strangeplace.net>
Sat, 30 Dec 2017 20:32:59 +0000 (21:32 +0100)
diff --cc src/include/gnunet_common.h
Simple merge
diff --cc src/include/gnunet_scheduler_lib.h
Simple merge
diff --cc src/util/network.c
Simple merge
author	lurchi <lurchi@strangeplace.net>
	Sat, 30 Dec 2017 20:32:59 +0000 (21:32 +0100)
committer	lurchi <lurchi@strangeplace.net>
	Sat, 30 Dec 2017 20:32:59 +0000 (21:32 +0100)
		1	2
src/include/gnunet_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/gnunet_scheduler_lib.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/util/network.c	patch \|	diff1 \|	diff2 \|	blob \| history