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

author Simone Piccardi <piccardi@truelite.it>

Wed, 23 Oct 2024 14:30:16 +0000 (16:30 +0200)

committer Simone Piccardi <piccardi@truelite.it>

Wed, 23 Oct 2024 14:30:16 +0000 (16:30 +0200)
author Simone Piccardi <piccardi@truelite.it>
Wed, 23 Oct 2024 14:30:16 +0000 (16:30 +0200)
committer Simone Piccardi <piccardi@truelite.it>
Wed, 23 Oct 2024 14:30:16 +0000 (16:30 +0200)
diff --cc filedir.tex
Simple merge
diff --cc fileio.tex
Simple merge
diff --cc procadv.tex
Simple merge
author	Simone Piccardi <piccardi@truelite.it>
	Wed, 23 Oct 2024 14:30:16 +0000 (16:30 +0200)
committer	Simone Piccardi <piccardi@truelite.it>
	Wed, 23 Oct 2024 14:30:16 +0000 (16:30 +0200)
		1	2
filedir.tex	patch \|	diff1 \|	diff2 \|	blob \| history
fileio.tex	patch \|	diff1 \|	diff2 \|	blob \| history
procadv.tex	patch \|	diff1 \|	diff2 \|	blob \| history