diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-07-19 20:22:59 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-07-19 20:22:59 +0200 |
| commit | 86eb0c08d233636cd4647649c6542d3cf410e3ab (patch) | |
| tree | 9721759b41f0256f15c3786c357448a93215440e /src/resources/npcdb.cpp | |
| parent | 335eec717f6189c01d8217dd2c4f4e74a171d9a5 (diff) | |
| parent | 2d584d7e8aaeacbcb1036bae5c8deca9b810fe60 (diff) | |
| download | Mana-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.gz Mana-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.bz2 Mana-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.xz Mana-86eb0c08d233636cd4647649c6542d3cf410e3ab.zip | |
Merge branch '1.0'
Conflicts:
src/gui/itempopup.cpp
src/item.cpp
src/monster.cpp
src/net/manaserv/playerhandler.cpp
src/net/tmwa/partyhandler.cpp
src/npc.cpp
src/player.cpp
src/resources/itemdb.cpp
src/resources/monsterdb.cpp
src/resources/monsterinfo.cpp
src/resources/npcdb.cpp
src/resources/spritedef.cpp
Diffstat (limited to 'src/resources/npcdb.cpp')
| -rw-r--r-- | src/resources/npcdb.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index 4f0ee10d..ec22c225 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -27,6 +27,7 @@ #include "utils/dtor.h" #include "utils/xml.h" +#include "configuration.h" namespace { |