Merge pull request #322 from commonism/cleanups

author Roger Wolff <R.E.Wolff@BitWizard.nl>

Thu, 10 Oct 2019 09:54:15 +0000 (11:54 +0200)

committer GitHub <noreply@github.com>

Thu, 10 Oct 2019 09:54:15 +0000 (11:54 +0200)
author Roger Wolff <R.E.Wolff@BitWizard.nl>
Thu, 10 Oct 2019 09:54:15 +0000 (11:54 +0200)
committer GitHub <noreply@github.com>
Thu, 10 Oct 2019 09:54:15 +0000 (11:54 +0200)
diff --cc Makefile.am
Simple merge
diff --cc ui/dns.c
Simple merge
diff --cc ui/gtk.c
Simple merge
author	Roger Wolff <R.E.Wolff@BitWizard.nl>
	Thu, 10 Oct 2019 09:54:15 +0000 (11:54 +0200)
committer	GitHub <noreply@github.com>
	Thu, 10 Oct 2019 09:54:15 +0000 (11:54 +0200)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
ui/dns.c	patch \|	diff1 \|	diff2 \|	blob \| history
ui/gtk.c	patch \|	diff1 \|	diff2 \|	blob \| history