Merge from trunk.
commitb8f11c2978f028c4e0c496cadd4ef915c41497bf
authorSimon Howard <fraggle@gmail.com>
Sat, 21 Nov 2009 01:16:14 +0000 (21 01:16 +0000)
committerSimon Howard <fraggle@gmail.com>
Sat, 21 Nov 2009 01:16:14 +0000 (21 01:16 +0000)
treea8b129669b75f1c5d22f9fef7a4eda03e455b9be
parentb519725dd879ed74c612e86457edf2ee8ea4a800
Merge from trunk.

git-svn-id: https://chocolate-doom.svn.sourceforge.net/svnroot/chocolate-doom/branches/opl-branch@1734 ee5ca603-980d-0410-972c-a23fc50d79fe
21 files changed:
Makefile.am
configure.in
msvc/ChocolateDoom.vcproj
pkg/Makefile.am [new file with mode: 0644]
pkg/wince/GNUmakefile.am [moved from pkg/wince/Makefile.am with 84% similarity]
setup/Makefile.am
setup/configfile.c
setup/execute.c
setup/mainmenu.c
setup/sound.c
setup/sound.h
src/i_sdlmusic.c
src/i_video.c
src/m_config.c
src/m_misc.c
src/m_misc.h
src/p_doors.c
src/p_map.c
src/p_spec.c
src/s_sound.c
textscreen/txt_sdl.c