Merge branch 'cde-fixups-1' of ssh://git.code.sf.net/p/cdesktopenv/code into cde...

author Peter Howkins <flibble@users.sf.net>

Sat, 28 Apr 2018 19:34:39 +0000 (20:34 +0100)

committer Peter Howkins <flibble@users.sf.net>

Sat, 28 Apr 2018 19:34:39 +0000 (20:34 +0100)
author Peter Howkins <flibble@users.sf.net>
Sat, 28 Apr 2018 19:34:39 +0000 (20:34 +0100)
committer Peter Howkins <flibble@users.sf.net>
Sat, 28 Apr 2018 19:34:39 +0000 (20:34 +0100)
diff --cc cde/programs/dticon/fileIO.c
Simple merge
diff --cc cde/programs/dticon/fileIODialog.c
Simple merge
diff --cc cde/programs/dticon/process.c
Simple merge
diff --cc cde/programs/dticon/utils.c
Simple merge
author	Peter Howkins <flibble@users.sf.net>
	Sat, 28 Apr 2018 19:34:39 +0000 (20:34 +0100)
committer	Peter Howkins <flibble@users.sf.net>
	Sat, 28 Apr 2018 19:34:39 +0000 (20:34 +0100)
		1	2
cde/programs/dticon/fileIO.c	patch \|	diff1 \|	diff2 \|	blob \| history
cde/programs/dticon/fileIODialog.c	patch \|	diff1 \|	diff2 \|	blob \| history
cde/programs/dticon/process.c	patch \|	diff1 \|	diff2 \|	blob \| history
cde/programs/dticon/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history