doom · commit

commit 55a7efa90416c78bf95e5d552b05e4b6303e0e8f
Merge: 02c7144d ec5b192d
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon Jun 13 00:45:20 2016 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Mon Jun 13 00:45:20 2016 -0400

    Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

 opl/opl3.c          |  47 +++--------------
 opl/opl3.h          |   2 +-
 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/wi_stuff.c |   4 +-
 7 files changed, 58 insertions(+), 158 deletions(-)