[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.525,1.526 util.cpp,2.2,2.3 util.h,2.2,2.3

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15181/scumm

Modified Files:
	scumm.h util.cpp util.h 
Log Message:
A little more moving around #include's (last one for today ;-)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -d -r1.525 -r1.526
--- scumm.h	6 Jan 2005 15:57:12 -0000	1.525
+++ scumm.h	10 Jan 2005 22:51:26 -0000	1.526
@@ -28,6 +28,7 @@
 #include "common/map.h"
 #include "common/rect.h"
 #include "common/str.h"
+#include "common/util.h"
 
 #include "scumm/gfx.h"
 #include "scumm/script.h"

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- util.cpp	1 Jan 2005 16:09:16 -0000	2.2
+++ util.cpp	10 Jan 2005 22:51:41 -0000	2.3
@@ -20,6 +20,7 @@
  */
 
 #include "scumm/util.h"
+#include "common/util.h"
 
 namespace Scumm {
 

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.h,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- util.h	1 Jan 2005 16:09:16 -0000	2.2
+++ util.h	10 Jan 2005 22:51:41 -0000	2.3
@@ -23,7 +23,6 @@
 #define SCUMM_UTIL_H
 
 #include "common/file.h"
-#include "common/util.h"
 
 namespace Scumm {