commit c139624650e69916e3a03dbce839d32bdf779b92
Merge: b5d296d2 ec5b192d
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Jun 11 17:28:47 2016 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Sat Jun 11 17:28:47 2016 -0400
Merge remote-tracking branch 'origin/master' into sdl2-branch
.github/CONTRIBUTING.md | 6 +-
.travis.yml | 2 +-
HACKING => HACKING.md | 124 +-
Makefile.am | 20 +-
NEWS | 1178 ----------------
NEWS.md | 1164 +++++++++++++++
NOT-BUGS => NOT-BUGS.md | 92 +-
PHILOSOPHY => PHILOSOPHY.md | 92 +-
README.Music => README.Music.md | 82 +-
README.Strife => README.Strife.md | 73 +-
README => README.md | 38 +-
TODO | 56 -
TODO.md | 36 +
opl/opl3.c | 47 +-
opl/opl3.h | 2 +-
pkg/config.make.in | 9 +-
pkg/osx/GNUmakefile | 3 +-
pkg/win32/GNUmakefile | 8 +-
rpm.spec.in | 8 +-
src/doom/am_map.c | 11 +-
src/doom/d_main.c | 2 +-
src/doom/f_finale.c | 2 +-
src/doom/m_menu.c | 148 +-
src/doom/statdump.c | 712 +++++-----
src/doom/statdump.h | 46 +-
src/doom/wi_stuff.c | 4 +-
src/strife/m_saves.c | 1056 +++++++-------
src/strife/m_saves.h | 112 +-
src/strife/p_dialog.c | 2826 ++++++++++++++++++-------------------
src/strife/p_dialog.h | 204 +--
src/strife/p_plats.c | 8 +-
31 files changed, 4012 insertions(+), 4159 deletions(-)
diff --cc README.Music.md
index 33b2e451,2cc4482b..4a18e491
--- a/README.Music.md
+++ b/README.Music.md
@@@ -7,13 -6,13 +6,13 @@@ different options for music playback, d
Most modern operating systems have some kind of built-in support for
MIDI playback; some have very good quality MIDI playback (Mac OS X for
- example). To use this, choose "Native MIDI" in the sound configuration
+ example). To use this, choose “Native MIDI” in the sound configuration
dialog in the setup tool.
- == Timidity ==
+ ## Timidity
Timidity is a software-based MIDI synthesizer, and a version of it is
-included in the SDL_mixer library used by Chocolate Doom. To use
+included in the SDL2_mixer library used by Chocolate Doom. To use
Timidity for MIDI playback, first download a sound font. An example of
a good quality sound font is the eawpats font, which can be downloaded
from the idgames archive as sounds/eawpats.zip: