diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /po/POTFILES.in | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | plus-stripped1.1.9.4.tar.gz plus-stripped1.1.9.4.tar.bz2 plus-stripped1.1.9.4.tar.xz plus-stripped1.1.9.4.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'po/POTFILES.in')
| -rw-r--r-- | po/POTFILES.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 311ca756d..2ebb99798 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -24,6 +24,7 @@ src/gui/inventorywindow.cpp src/gui/itemamountwindow.cpp src/gui/itempopup.cpp src/gui/killstats.cpp +src/guildmanager.cpp src/gui/logindialog.cpp src/gui/minimap.cpp src/gui/ministatuswindow.cpp @@ -66,6 +67,7 @@ src/gui/whoisonline.cpp src/gui/widgets/battletab.cpp src/gui/widgets/channeltab.cpp src/gui/widgets/chattab.cpp +src/gui/widgets/guildchattab.cpp src/gui/widgets/setupitem.cpp src/gui/widgets/tradetab.cpp src/gui/widgets/whispertab.cpp |