OSDN Git Service

Fix merge
authorStarg <starg@users.osdn.me>
Sat, 14 Mar 2020 12:21:37 +0000 (21:21 +0900)
committerStarg <starg@users.osdn.me>
Sat, 14 Mar 2020 12:21:37 +0000 (21:21 +0900)
commit34b0e6d65d5979ea04c80951a2b1d30121f7ee7f
tree256e173400570154080362151d3e73405064b561
parentc270d8347a82450bfc605a293558ae3f1a39b633
Fix merge
interface/w32g_pref.c
interface/w32g_res.h
timidity/playmidi.h