diff options
| author | Littleboy | 2011-05-02 17:18:22 -0400 |
|---|---|---|
| committer | Littleboy | 2011-05-02 17:21:10 -0400 |
| commit | 0e45aa8655dc3122e8d88dbcb67ab2013a292989 (patch) | |
| tree | f523e5c1870497528d85385ce5ef24259937813c /common/unarj.h | |
| parent | 580986aa42889c9a775b3ebe5709292d779f41cf (diff) | |
| parent | 1aff380a15f12e53bd380fc2a189882e2d6172c0 (diff) | |
| download | scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.gz scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.bz2 scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.zip | |
Merge remote-tracking branch 'upstream/master' into nsis
Conflicts:
devtools/create_project/scripts/postbuild.cmd
devtools/create_project/visualstudio.cpp
ports.mk
Diffstat (limited to 'common/unarj.h')
| -rw-r--r-- | common/unarj.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/unarj.h b/common/unarj.h index fa7d388542..fe23ba5694 100644 --- a/common/unarj.h +++ b/common/unarj.h @@ -32,10 +32,11 @@ #ifndef COMMON_UNARJ_H #define COMMON_UNARJ_H +#include "common/str.h" + namespace Common { class Archive; -class String; /** * This factory method creates an Archive instance corresponding to the content |