Merge from trunk.
commita0982631aa5a855f00d195e8acb123846c3a7324
authorSimon Howard <fraggle@gmail.com>
Wed, 27 Jan 2010 19:50:30 +0000 (27 19:50 +0000)
committerSimon Howard <fraggle@gmail.com>
Wed, 27 Jan 2010 19:50:30 +0000 (27 19:50 +0000)
treeb6cf4f848092d6522a7d530a26ee6e9f5bacf4f8
parentb8f11c2978f028c4e0c496cadd4ef915c41497bf
parent910ccc263051fb410a8df35ed2903882b01f18f2
Merge from trunk.

git-svn-id: https://chocolate-doom.svn.sourceforge.net/svnroot/chocolate-doom/branches/opl-branch@1829 ee5ca603-980d-0410-972c-a23fc50d79fe
Makefile.am
configure.in
src/Makefile.am