diff options
| author | Petr Mrázek | 2012-02-11 18:48:17 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2012-02-11 18:48:17 +0100 |
| commit | 8527547cbe050cb0b5e50c162354f1eb069a554a (patch) | |
| tree | 19165341f455a79f01745e1bcd2c70b7e8183058 /library/VersionInfoFactory.cpp | |
| parent | aee5efe7c0d0cdf784fb8bdb445cc233435d47dd (diff) | |
| parent | f469fab1e6e419ff26655bc3fe9868653dc0f0f0 (diff) | |
| download | dfhack-8527547cbe050cb0b5e50c162354f1eb069a554a.tar.gz dfhack-8527547cbe050cb0b5e50c162354f1eb069a554a.tar.bz2 dfhack-8527547cbe050cb0b5e50c162354f1eb069a554a.tar.xz | |
Merge branch 'master' into purge
Conflicts:
library/DataDefs.cpp
Diffstat (limited to 'library/VersionInfoFactory.cpp')
| -rw-r--r-- | library/VersionInfoFactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/VersionInfoFactory.cpp b/library/VersionInfoFactory.cpp index c6914583..58282bae 100644 --- a/library/VersionInfoFactory.cpp +++ b/library/VersionInfoFactory.cpp @@ -122,7 +122,7 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem) { const char *cstr_key = pMemEntry->Attribute("key"); if(!cstr_key) - throw Error::MemoryXmlUnderspecifiedEntry(cstr_key); + throw Error::MemoryXmlUnderspecifiedEntry(cstr_name); const char *cstr_value = pMemEntry->Attribute("value"); if(!cstr_value) throw Error::MemoryXmlUnderspecifiedEntry(cstr_name); |
