diff options
| author | Travis Howell | 2002-11-30 16:47:16 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-11-30 16:47:16 +0000 |
| commit | 2fe56a4c6a0dc18d1b03804b1f51cbf0a7821237 (patch) | |
| tree | 8acad2cd682f4311fd4507b8232bb7d19170c411 /scumm | |
| parent | 7044497296d49721a77bc2099eac421ca3be9f00 (diff) | |
| download | scummvm-rg350-2fe56a4c6a0dc18d1b03804b1f51cbf0a7821237.tar.gz scummvm-rg350-2fe56a4c6a0dc18d1b03804b1f51cbf0a7821237.tar.bz2 scummvm-rg350-2fe56a4c6a0dc18d1b03804b1f51cbf0a7821237.zip | |
Add back changes that were reverted
svn-id: r5764
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 9e62671274..511fe03a6d 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -22,22 +22,22 @@ #include "stdafx.h" #include "scumm.h" -#include "sound/mixer.h" -#include "sound/mididrv.h" -#include "scumm/sound.h" -#include "scumm/imuse.h" -#include "scumm/bundle.h" #include "actor.h" +#include "bundle.h" #include "debug.h" #include "dialogs.h" -#include "gui/newgui.h" -#include "gui/message.h" +#include "imuse.h" #include "object.h" #include "resource.h" +#include "sound.h" #include "string.h" #include "verbs.h" #include "common/gameDetector.h" #include "common/config-file.h" +#include "gui/newgui.h" +#include "gui/message.h" +#include "sound/mixer.h" +#include "sound/mididrv.h" #ifdef _WIN32_WCE extern void drawError(char*); |