diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-17 20:17:33 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-17 20:20:33 +0100 |
| commit | e02c372c50b3d8b498661a05183f460ae6ae395f (patch) | |
| tree | 870758913ad8880b8c86e0168e4334c7722df9ee /src/gui/npcstringdialog.cpp | |
| parent | 26a52e8f74306b6e13e7a2029c19d8c7e1efd23a (diff) | |
| parent | a40c16cac5356d18aa6fc3f4549ece152713cfe2 (diff) | |
| download | mana-e02c372c50b3d8b498661a05183f460ae6ae395f.tar.gz mana-e02c372c50b3d8b498661a05183f460ae6ae395f.tar.bz2 mana-e02c372c50b3d8b498661a05183f460ae6ae395f.tar.xz mana-e02c372c50b3d8b498661a05183f460ae6ae395f.zip | |
Merge branch 'aethyra/master'
Conflicts:
src/gui/npc_text.cpp
src/gui/npc_text.h
src/gui/npcintegerdialog.cpp
src/gui/npclistdialog.cpp
src/gui/npcstringdialog.cpp
src/net/npchandler.cpp
src/npc.cpp
Diffstat (limited to 'src/gui/npcstringdialog.cpp')
| -rw-r--r-- | src/gui/npcstringdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp index f2ccc3cf..d9bf5682 100644 --- a/src/gui/npcstringdialog.cpp +++ b/src/gui/npcstringdialog.cpp @@ -24,13 +24,13 @@ #include "npcstringdialog.h" #include "textfield.h" +#include "widgets/layout.h" + #include "../npc.h" #include "../utils/gettext.h" #include "../utils/strprintf.h" -#include "widgets/layout.h" - extern NpcTextDialog *npcTextDialog; NpcStringDialog::NpcStringDialog(): |