diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
| commit | 0bc538b08ca5c4efea86700cb6c4685da3f34345 (patch) | |
| tree | e5b0fe4b967ecb7e9251faf21904bbbe825aaab7 /po/POTFILES.in | |
| parent | b152f3a052eca7225870a7dc4d8a719bee107f0f (diff) | |
| parent | 2654eb7781ddcfe53064745bbad77bffe5c8eada (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
Diffstat (limited to 'po/POTFILES.in')
| -rw-r--r-- | po/POTFILES.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 2cd451f5..534feb15 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -15,7 +15,7 @@ src/modules/alsa/alsa-util.c src/modules/module-pipe-source.c src/modules/module-solaris.c src/modules/module-default-device-restore.c -src/modules/module-x11-xsmp.c +src/modules/x11/module-x11-xsmp.c src/modules/module-remap-sink.c src/modules/bluetooth/module-bluetooth-proximity.c src/modules/module-detect.c @@ -24,23 +24,23 @@ src/modules/module-lirc.c src/modules/module-hal-detect.c src/modules/module-sine.c src/modules/module-zeroconf-publish.c -src/modules/module-jack-source.c +src/modules/jack/module-jack-source.c src/modules/module-cli.c src/modules/gconf/module-gconf.c src/modules/gconf/gconf-helper.c src/modules/module-esound-sink.c src/modules/alsa/module-alsa-sink.c src/modules/module-volume-restore.c -src/modules/module-x11-bell.c +src/modules/x11/module-x11-bell.c src/modules/module-protocol-stub.c src/modules/module-stream-restore.c -src/modules/module-jack-sink.c +src/modules/jack/module-jack-sink.c src/modules/module-esound-compat-spawnfd.c src/modules/module-esound-compat-spawnpid.c #src/modules/module-waveout.c src/modules/module-combine.c src/modules/bluetooth/proximity-helper.c -src/modules/module-x11-publish.c +src/modules/x11/module-x11-publish.c src/modules/rtp/module-rtp-recv.c src/modules/rtp/sdp.c src/modules/rtp/rtp.c @@ -190,7 +190,6 @@ src/utils/pactl.c src/utils/padsp.c src/utils/pax11publish.c src/utils/pacmd.c -src/utils/paplay.c src/pulsecore/lock-autospawn.c src/modules/alsa/alsa-sink.c src/modules/alsa/alsa-source.c |