commit 06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7
Merge: 4a70f989 508c3fd3
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Oct 1 01:10:17 2009 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Thu Oct 1 01:10:17 2009 +0000
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1702
acinclude.m4 | 5 +++++
pcsound/pcsound.c | 2 +-
pcsound/pcsound_sdl.c | 18 +++++++++---------
setup/joystick.c | 2 +-
setup/mainmenu.c | 6 +++---
setup/multiplayer.c | 2 +-
src/d_iwad.c | 2 +-
src/d_iwad.h | 2 +-
src/d_main.c | 4 ++--
src/d_net.h | 2 +-
src/deh_defs.h | 2 +-
src/deh_main.c | 4 ++--
src/deh_ptr.c | 2 +-
src/deh_text.c | 2 +-
src/doomdef.h | 2 +-
src/i_joystick.c | 2 +-
src/i_pcsound.c | 18 +++++++++---------
src/i_sdlmusic.c | 42 +++++++++++++++++++++---------------------
src/i_sdlsound.c | 18 +++++++++---------
src/i_timer.c | 2 +-
src/i_timer.h | 2 +-
src/i_video.c | 22 ++++++++++++----------
src/net_client.c | 4 ++--
src/net_common.c | 4 ++--
src/net_defs.h | 4 ++--
src/net_gui.c | 2 +-
src/net_loop.c | 4 ++--
src/net_sdl.c | 2 +-
src/net_server.c | 14 +++++++-------
src/net_server.h | 2 +-
src/s_sound.c | 10 +++++-----
src/s_sound.h | 6 +++---
src/w_merge.c | 2 +-
textscreen/txt_desktop.c | 4 ++--
textscreen/txt_dropdown.c | 2 +-
textscreen/txt_gui.c | 8 ++++----
textscreen/txt_gui.h | 6 +++---
textscreen/txt_inputbox.c | 2 +-
textscreen/txt_io.c | 6 +++---
textscreen/txt_io.h | 2 +-
textscreen/txt_main.h | 2 +-
textscreen/txt_sdl.c | 8 ++++----
textscreen/txt_widget.c | 4 ++--
textscreen/txt_widget.h | 4 ++--
textscreen/txt_window_action.c | 2 +-
textscreen/txt_window_action.h | 2 +-
46 files changed, 138 insertions(+), 131 deletions(-)