diff options
| author | Alyssa Milburn | 2011-08-17 09:28:51 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-17 09:28:51 +0200 |
| commit | ae287ccee58ebf68ab6125e5bbb4d8a44874330e (patch) | |
| tree | 2f4cee4b2940466b8a578962e0174c6f89077a40 /engines/tsage/dialogs.h | |
| parent | f5255288eabc0527c4c6b727a9db6b8d09a31206 (diff) | |
| parent | e36832bbf84cba88fe6b17e1634fab0d550f13df (diff) | |
| download | scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.tar.gz scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.tar.bz2 scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.zip | |
Merge remote-tracking branch 'origin/master' into soccer
Conflicts:
engines/scumm/he/logic_he.cpp
engines/scumm/he/logic_he.h
Diffstat (limited to 'engines/tsage/dialogs.h')
| -rw-r--r-- | engines/tsage/dialogs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/tsage/dialogs.h b/engines/tsage/dialogs.h index a50307f775..55adb6c813 100644 --- a/engines/tsage/dialogs.h +++ b/engines/tsage/dialogs.h @@ -30,7 +30,7 @@ #include "common/rect.h" #include "common/system.h" -namespace tSage { +namespace TsAGE { class MessageDialog : public GfxDialog { public: @@ -128,6 +128,6 @@ public: static void show(); }; -} // End of namespace tSage +} // End of namespace TsAGE #endif |