diff options
| author | David Corrales | 2007-05-26 20:23:24 +0000 |
|---|---|---|
| committer | David Corrales | 2007-05-26 20:23:24 +0000 |
| commit | 3646c968c9578c2a94d65ebd5fb06ec835f8c51d (patch) | |
| tree | 8b57b339ebb31a1d7a67f1678aa5dc5c7759070a /engines/cine/object.cpp | |
| parent | d1f56d93f934150f4b579c2e90564e2bf035f113 (diff) | |
| parent | ac45c5b33d834acbc9718f89be76e49d403a4d2c (diff) | |
| download | scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.tar.gz scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.tar.bz2 scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.zip | |
Merged the fs branch with trunk. r26472:26948
svn-id: r26949
Diffstat (limited to 'engines/cine/object.cpp')
| -rw-r--r-- | engines/cine/object.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp index 80c4b1999c..980bcfe5d7 100644 --- a/engines/cine/object.cpp +++ b/engines/cine/object.cpp @@ -30,7 +30,6 @@ #include "cine/cine.h" #include "cine/object.h" #include "cine/part.h" -#include "cine/resource.h" #include "cine/various.h" namespace Cine { |