diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /engines/kyra/resource.h | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'engines/kyra/resource.h')
| -rw-r--r-- | engines/kyra/resource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 7a6bdbd73e..f414cacee8 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -37,7 +37,7 @@ #include "common/ptr.h" #include "kyra/kyra.h" -#include "kyra/kyra_v2.h" +#include "kyra/kyra_hof.h" namespace Kyra { |