diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 16:40:52 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 16:40:52 +0100 |
| commit | d6d906e2ad7b459882d628dfb07ed30ee36ed26b (patch) | |
| tree | adcdd0ef5bfbff1a8df77b1420bf2c877cd00c82 /po/POTFILES.in | |
| parent | 1a5af5210f640d900efac540d781a80c90959c22 (diff) | |
| parent | 4624f64d9bd89cd80030b2c0f143cfe4d2197229 (diff) | |
| download | Mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.gz Mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.bz2 Mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.xz Mana-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.zip | |
Merge branch '0.0.28'
Conflicts:
po/POTFILES.in
src/main.cpp
src/main.h
tmw.cbp
Diffstat (limited to 'po/POTFILES.in')
| -rw-r--r-- | po/POTFILES.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 1b3dea84..034b0a79 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -19,18 +19,18 @@ src/gui/itempopup.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp +src/gui/npc_text.cpp src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npcstringdialog.cpp -src/gui/npc_text.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/recorder.h src/gui/register.cpp src/gui/sell.cpp -src/gui/setup_audio.cpp src/gui/setup.cpp +src/gui/setup_audio.cpp src/gui/setup_colors.cpp src/gui/setup_joystick.cpp src/gui/setup_keyboard.cpp |