diff options
| author | Matthew Hoops | 2011-05-11 00:30:02 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-11 00:30:28 -0400 |
| commit | a1d41da096c0bcf502a85919cb1cb1ee471719c5 (patch) | |
| tree | 8c51419daa486f1d4833757db4715dadab6c3497 /common/xmlparser.h | |
| parent | accb0c2a5d0c9e7b353cda4b74f511a498ed8073 (diff) | |
| parent | 33c3e19cea2a08fbf26ecbe940763e8ee1c37d28 (diff) | |
| download | scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.gz scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.bz2 scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
audio/decoders/qdm2.h
common/util.cpp
engines/groovie/music.cpp
engines/groovie/resource.h
video/qt_decoder.cpp
video/qt_decoder.h
Diffstat (limited to 'common/xmlparser.h')
| -rw-r--r-- | common/xmlparser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/xmlparser.h b/common/xmlparser.h index ec8f371681..c456fd0826 100644 --- a/common/xmlparser.h +++ b/common/xmlparser.h @@ -29,6 +29,7 @@ #include "common/scummsys.h" #include "common/types.h" +#include "common/fs.h" #include "common/list.h" #include "common/hashmap.h" #include "common/hash-str.h" @@ -37,7 +38,6 @@ namespace Common { -class FSNode; class SeekableReadStream; #define MAX_XML_DEPTH 8 |