diff options
| author | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
| commit | 84063dc9727a9f55e09d39574027beab695680e6 (patch) | |
| tree | d71a9599cb550d9f7949a2d3209574064e054d85 /common/xmlparser.cpp | |
| parent | c6e89df3d940747a85d447f172e2323c800f5eaf (diff) | |
| parent | a39a3eda46aea108a51556f001617ad28d29e520 (diff) | |
| download | scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.gz scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.bz2 scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.zip | |
Merge remote-tracking branch 'origin/master' into soltys_wip2
Diffstat (limited to 'common/xmlparser.cpp')
| -rw-r--r-- | common/xmlparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp index 623619914a..f768e44382 100644 --- a/common/xmlparser.cpp +++ b/common/xmlparser.cpp @@ -81,7 +81,7 @@ void XMLParser::close() { _stream = 0; } -bool XMLParser::parserError(const Common::String &errStr) { +bool XMLParser::parserError(const String &errStr) { _state = kParserError; const int startPosition = _stream->pos(); |