diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-16 21:25:48 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-16 21:25:48 +0300 |
| commit | bcaba0b1b43d6a1b32aadfa98860f40b2c93e136 (patch) | |
| tree | 6bd0d60a8fa822bfd688b90d062d0f73eee2e47e /po/POTFILES.in | |
| parent | 2bb3eef414f80189cf6af6cd66c519630e4c0a43 (diff) | |
| parent | 01e4b61a910afdd21f860fadbe98075735c2bf51 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/Makefile.am
src/daemon/daemon-conf.c
src/daemon/daemon.conf.in
src/modules/module-stream-restore.c
src/pulse/client-conf.c
src/pulsecore/namereg.c
Diffstat (limited to 'po/POTFILES.in')
| -rw-r--r-- | po/POTFILES.in | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 534feb15..a6172442 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -55,7 +55,6 @@ src/pulsecore/queue.c src/pulsecore/core.c #src/pulsecore/shmasyncq.c src/pulsecore/x11wrap.c -src/pulsecore/rtclock.c src/pulsecore/ioline.c src/pulsecore/asyncq.c src/pulsecore/mutex-posix.c @@ -99,7 +98,6 @@ src/pulsecore/strlist.c src/pulsecore/msgobject.c src/pulsecore/mutex-win32.c src/pulsecore/dynarray.c -src/pulsecore/rtsig.c src/pulsecore/once.c src/pulsecore/source.c src/pulsecore/memchunk.c @@ -149,14 +147,12 @@ src/pulsecore/protocol-http.c src/pulsecore/semaphore-win32.c src/daemon/cpulimit.c src/daemon/ltdl-bind-now.c -src/daemon/polkit.c src/daemon/main.c src/daemon/cmdline.c src/daemon/dumpmodules.c src/daemon/daemon-conf.c src/daemon/caps.c src/daemon/pulseaudio.desktop.in -src/daemon/org.pulseaudio.policy.in src/pulse/channelmap.c src/pulse/error.c src/pulse/proplist.c |