diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-05-02 10:10:37 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-05-02 10:11:19 +0200 |
| commit | 679d830d0ba6ecbcd698b1ff2625144d08314b9e (patch) | |
| tree | 24e5c1ea5fa6f11165d726cd345726fd3dae8fdd /src/SDLMain.h | |
| parent | 35108f09f64835a8d02c5bfb2ec62426ab83bd59 (diff) | |
| parent | a6b11834f227b8edbfb39633380806480fd2a2c5 (diff) | |
| download | mana-679d830d0ba6ecbcd698b1ff2625144d08314b9e.tar.gz mana-679d830d0ba6ecbcd698b1ff2625144d08314b9e.tar.bz2 mana-679d830d0ba6ecbcd698b1ff2625144d08314b9e.tar.xz mana-679d830d0ba6ecbcd698b1ff2625144d08314b9e.zip | |
Merge branch 'master' into lpc2012
This merge reverts change 3b22c2cf170c877904dcef5a4af03ac360bd0581.
Conflicts:
src/gui/charcreatedialog.cpp
src/net/manaserv/manaserv_protocol.h
Diffstat (limited to 'src/SDLMain.h')
0 files changed, 0 insertions, 0 deletions