Edward Richardson e5c67cee83 Merge branch conflicts fix ... - CONFLICT (content): Merge conflict in src/p_acs.cpp - Updated position variables		2016-01-21 10:49:57 +13:00
..
common.h	Didn't need note_off_decay in the WildMidi sample struct	2016-01-11 20:07:14 -06:00
file_io.cpp	Merge branch conflicts fix	2016-01-21 10:49:57 +13:00
file_io.h
gus_pat.cpp	Didn't need note_off_decay in the WildMidi sample struct	2016-01-11 20:07:14 -06:00
gus_pat.h
reverb.cpp
reverb.h
wildmidi_lib.cpp	Make _WM_AdjustNoteVolume's pan_ofs a signed int	2016-01-12 06:35:05 -06:00
wildmidi_lib.h
wm_error.cpp
wm_error.h