diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
commit | 019331d25b6af107fb8cacc3ada552e7567a64bf (patch) | |
tree | d5545e795e164fb6cd8edae1a45e7b8bb966ee12 /po/POTFILES.in | |
parent | 587131917f9129c8347c789febb7e755dfb091de (diff) | |
parent | afd1b6d355ef1a41cb3592485855e273a5de69c1 (diff) |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
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 a6172442..0bf70873 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -192,3 +192,5 @@ src/modules/alsa/alsa-source.c src/modules/alsa/module-alsa-card.c src/modules/bluetooth/module-bluetooth-device.c src/modules/reserve-wrap.c +src/modules/module-rygel-media-server.c +src/modules/alsa/alsa-mixer.c |