diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-10 21:57:09 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-10 21:57:09 +0100 |
| commit | 9f2a8799eea3d609a3863a7732ec280d83f12e47 (patch) | |
| tree | 719f9e8703211937fc2452055c7a8d5be05bd2f8 /src/gui/itempopup.cpp | |
| parent | 53840c3fe951c77fa7965efcac4ed77b52da14d9 (diff) | |
| parent | a8a992ade40c9d68c9faec1cc3a54e7f064fb9d5 (diff) | |
| download | mana-client-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.gz mana-client-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.bz2 mana-client-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.xz mana-client-9f2a8799eea3d609a3863a7732ec280d83f12e47.zip | |
Merge branch 'aethyra/master'
Conflicts:
docs/FAQ.txt
packaging/windows/make-translations.vbs
src/Makefile.am
src/gui/colour.cpp
src/gui/colour.h
src/gui/popupmenu.cpp
src/gui/setup_colours.h
src/main.cpp
src/main.h
src/resources/resourcemanager.cpp
src/text.cpp
src/text.h
src/textmanager.cpp
src/textmanager.h
Diffstat (limited to 'src/gui/itempopup.cpp')
0 files changed, 0 insertions, 0 deletions