diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
| commit | e55b0d8a97d0be6be188d5d13f675da935c039ef (patch) | |
| tree | ce9d7834fc75cd1c072bceff614ef3b1eb39052c /po/POTFILES.in | |
| parent | df5213d83c2bf1abd97568cef5a1a763bc425926 (diff) | |
| parent | 66d524c01720835a30716cb6861606f95629faea (diff) | |
fix conflict
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 df728fa..69875aa 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,6 +2,7 @@ src/audacious/main.cc src/libaudcore/adder.cc src/libaudcore/audstrings.cc +src/libaudcore/output.cc src/libaudcore/playback.cc src/libaudcore/playlist.cc src/libaudcore/playlist-files.cc @@ -22,6 +23,7 @@ src/libaudgui/playlists.cc src/libaudgui/plugin-menu.cc src/libaudgui/plugin-prefs.cc src/libaudgui/plugin-view.cc +src/libaudgui/prefs-widget.cc src/libaudgui/prefs-window.cc src/libaudgui/preset-browser.cc src/libaudgui/queue-manager.cc |