diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
| commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
| tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/gui/register.h | |
| parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
| parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
| download | mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip | |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/gui/register.h')
| -rw-r--r-- | src/gui/register.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/register.h b/src/gui/register.h index 8ba377fa..9588e07e 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -22,15 +22,13 @@ #ifndef REGISTER_H #define REGISTER_H -#include <iosfwd> +#include <string> #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> #include "window.h" -#include "../guichanfwd.h" - class LoginData; class OkDialog; class WrongDataNoticeListener; |