[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.84,1.85

Travis Howell kirben at users.sourceforge.net
Sat Nov 30 08:48:01 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10597/scumm

Modified Files:
	scummvm.cpp 
Log Message:

Add back changes that were reverted


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- scummvm.cpp	30 Nov 2002 16:33:57 -0000	1.84
+++ scummvm.cpp	30 Nov 2002 16:47:16 -0000	1.85
@@ -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*);





More information about the Scummvm-git-logs mailing list