Merge branch 'int-new' into mj-coro

author Jan Maria Matejka <mq@ucw.cz>

Mon, 27 Aug 2018 15:47:54 +0000 (17:47 +0200)

committer Jan Maria Matejka <mq@ucw.cz>

Mon, 27 Aug 2018 15:47:54 +0000 (17:47 +0200)
author Jan Maria Matejka <mq@ucw.cz>
Mon, 27 Aug 2018 15:47:54 +0000 (17:47 +0200)
committer Jan Maria Matejka <mq@ucw.cz>
Mon, 27 Aug 2018 15:47:54 +0000 (17:47 +0200)
diff --cc lib/socket.h
Simple merge
diff --cc nest/cli.c
Simple merge
diff --cc sysdep/unix/main.c
Simple merge
author	Jan Maria Matejka <mq@ucw.cz>
	Mon, 27 Aug 2018 15:47:54 +0000 (17:47 +0200)
committer	Jan Maria Matejka <mq@ucw.cz>
	Mon, 27 Aug 2018 15:47:54 +0000 (17:47 +0200)
		1	2
lib/socket.h	patch \|	diff1 \|	diff2 \|	blob \| history
nest/cli.c	patch \|	diff1 \|	diff2 \|	blob \| history
sysdep/unix/main.c	patch \|	diff1 \|	diff2 \|	blob \| history