Merge branch 'master' of ssh://roach.truelite.it/srv/git/gapil

author Simone Piccardi <piccardi@gnulinux.it>

Thu, 15 Oct 2020 08:48:23 +0000 (10:48 +0200)

committer Simone Piccardi <piccardi@gnulinux.it>

Thu, 15 Oct 2020 08:48:23 +0000 (10:48 +0200)
author Simone Piccardi <piccardi@gnulinux.it>
Thu, 15 Oct 2020 08:48:23 +0000 (10:48 +0200)
committer Simone Piccardi <piccardi@gnulinux.it>
Thu, 15 Oct 2020 08:48:23 +0000 (10:48 +0200)
diff --cc fileio.tex
Simple merge
diff --cc procadv.tex
Simple merge
diff --cc signal.tex
Simple merge
author	Simone Piccardi <piccardi@gnulinux.it>
	Thu, 15 Oct 2020 08:48:23 +0000 (10:48 +0200)
committer	Simone Piccardi <piccardi@gnulinux.it>
	Thu, 15 Oct 2020 08:48:23 +0000 (10:48 +0200)
		1	2
fileio.tex	patch \|	diff1 \|	diff2 \|	blob \| history
procadv.tex	patch \|	diff1 \|	diff2 \|	blob \| history
signal.tex	patch \|	diff1 \|	diff2 \|	blob \| history