diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-26 21:29:49 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-26 21:29:49 +0100 |
| commit | 3008805eea4b972265597ba196ab05ce64c69965 (patch) | |
| tree | d3195600e956e496b6b21f200fc04e5b08cab368 /tmw.cbp | |
| parent | 3ad6ac47d4967870a54fddd66aa9996724115b94 (diff) | |
| parent | 6b0cff837b7adae56dc90d12e9c0e256e6aab134 (diff) | |
| download | mana-client-3008805eea4b972265597ba196ab05ce64c69965.tar.gz mana-client-3008805eea4b972265597ba196ab05ce64c69965.tar.bz2 mana-client-3008805eea4b972265597ba196ab05ce64c69965.tar.xz mana-client-3008805eea4b972265597ba196ab05ce64c69965.zip | |
Merge branch 'aethyra/master'
Conflicts:
data/graphics/images/login_wallpaper.png
src/being.cpp
src/beingmanager.cpp
src/engine.cpp
src/game.cpp
src/gui/buysell.cpp
src/gui/buysell.h
src/gui/gui.h
src/gui/npc_text.cpp
src/gui/npc_text.h
src/gui/npcintegerdialog.cpp
src/gui/npclistdialog.cpp
src/gui/npclistdialog.h
src/gui/npcstringdialog.cpp
src/gui/sell.cpp
src/gui/shop.cpp
src/gui/table.cpp
src/net/beinghandler.cpp
src/net/npchandler.cpp
src/net/playerhandler.cpp
src/npc.cpp
src/npc.h
src/shopitem.cpp
src/shopitem.h
src/utils/stringutils.cpp
src/utils/stringutils.h
src/utils/trim.h
Diffstat (limited to 'tmw.cbp')
| -rw-r--r-- | tmw.cbp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -420,10 +420,10 @@ <Unit filename="src\utils\fastsqrt.h" /> <Unit filename="src\utils\gettext.h" /> <Unit filename="src\utils\mutex.h" /> + <Unit filename="src\utils\stringutils.cpp" /> + <Unit filename="src\utils\stringutils.h" /> <Unit filename="src\utils\strprintf.cpp" /> <Unit filename="src\utils\strprintf.h" /> - <Unit filename="src\utils\tostring.h" /> - <Unit filename="src\utils\trim.h" /> <Unit filename="src\utils\xml.cpp" /> <Unit filename="src\utils\xml.h" /> <Unit filename="src\vector.cpp" /> |