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/char_server.h | |
| 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/char_server.h')
0 files changed, 0 insertions, 0 deletions