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/gui/setup_joystick.cpp | |
| parent | 335eec717f6189c01d8217dd2c4f4e74a171d9a5 (diff) | |
| parent | 2d584d7e8aaeacbcb1036bae5c8deca9b810fe60 (diff) | |
| download | mana-client-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.gz mana-client-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.bz2 mana-client-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.xz mana-client-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/gui/setup_joystick.cpp')
0 files changed, 0 insertions, 0 deletions