commit 36f721637c5e5ac85671eb438ab9e6831933138c
Merge: 77a480fc e3954613
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Feb 28 13:27:56 2016 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Feb 28 13:27:56 2016 -0500

    Merge remote-tracking branch 'origin/master' into sdl2-branch

 msvc/libopl.vcproj |   12 +-
 opl/Makefile.am    |    2 +-
 opl/dbopl.c        | 1638 ----------------------------------------------------
 opl/dbopl.h        |  203 -------
 opl/opl3.c         | 1430 +++++++++++++++++++++++++++++++++++++++++++++
 opl/opl3.h         |  135 +++++
 opl/opl_sdl.c      |   35 +-
 7 files changed, 1579 insertions(+), 1876 deletions(-)