Merge UnkoTim224

author Starg <starg@users.osdn.me>

Thu, 14 Feb 2019 15:24:54 +0000 (00:24 +0900)

committer Starg <starg@users.osdn.me>

Thu, 14 Feb 2019 15:24:54 +0000 (00:24 +0900)
author Starg <starg@users.osdn.me>
Thu, 14 Feb 2019 15:24:54 +0000 (00:24 +0900)
committer Starg <starg@users.osdn.me>
Thu, 14 Feb 2019 15:24:54 +0000 (00:24 +0900)
diff --cc interface/w32g_ini.c
Simple merge
diff --cc interface/w32g_pref.c
Simple merge
diff --cc interface/w32g_utl.c
Simple merge
diff --cc timidity/int_synth.c
Simple merge
diff --cc timidity/readmidi.c
Simple merge
diff --cc timidity/timidity.c
Simple merge
diff --cc timidity/voice_effect.c
Simple merge
author	Starg <starg@users.osdn.me>
	Thu, 14 Feb 2019 15:24:54 +0000 (00:24 +0900)
committer	Starg <starg@users.osdn.me>
	Thu, 14 Feb 2019 15:24:54 +0000 (00:24 +0900)
		1	2
interface/w32g_ini.c	patch \|	diff1 \|	diff2 \|	blob \| history
interface/w32g_pref.c	patch \|	diff1 \|	diff2 \|	blob \| history
interface/w32g_utl.c	patch \|	diff1 \|	diff2 \|	blob \| history
timidity/int_synth.c	patch \|	diff1 \|	diff2 \|	blob \| history
timidity/readmidi.c	patch \|	diff1 \|	diff2 \|	blob \| history
timidity/timidity.c	patch \|	diff1 \|	diff2 \|	blob \| history
timidity/voice_effect.c	patch \|	diff1 \|	diff2 \|	blob \| history