diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-05-02 10:10:37 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-05-02 10:11:19 +0200 |
| commit | 679d830d0ba6ecbcd698b1ff2625144d08314b9e (patch) | |
| tree | 24e5c1ea5fa6f11165d726cd345726fd3dae8fdd /src/net/manaserv/generalhandler.cpp | |
| parent | 35108f09f64835a8d02c5bfb2ec62426ab83bd59 (diff) | |
| parent | a6b11834f227b8edbfb39633380806480fd2a2c5 (diff) | |
| download | mana-client-679d830d0ba6ecbcd698b1ff2625144d08314b9e.tar.gz mana-client-679d830d0ba6ecbcd698b1ff2625144d08314b9e.tar.bz2 mana-client-679d830d0ba6ecbcd698b1ff2625144d08314b9e.tar.xz mana-client-679d830d0ba6ecbcd698b1ff2625144d08314b9e.zip | |
Merge branch 'master' into lpc2012
This merge reverts change 3b22c2cf170c877904dcef5a4af03ac360bd0581.
Conflicts:
src/gui/charcreatedialog.cpp
src/net/manaserv/manaserv_protocol.h
Diffstat (limited to 'src/net/manaserv/generalhandler.cpp')
| -rw-r--r-- | src/net/manaserv/generalhandler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index d1fa41fe..c6b2af18 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -1,7 +1,7 @@ /* * The Mana Client * Copyright (C) 2009 The Mana World Development Team - * Copyright (C) 2009-2012 The Mana Developers + * Copyright (C) 2009-2013 The Mana Developers * * This file is part of The Mana Client. * @@ -47,9 +47,10 @@ #include "net/manaserv/partyhandler.h" #include "net/manaserv/playerhandler.h" #include "net/manaserv/specialhandler.h" -#include "net/manaserv/attributes.h" #include "net/manaserv/tradehandler.h" +#include "resources/attributes.h" + #include "utils/gettext.h" #include <list> |