Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Browse source

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

...

This commit is contained in:

Tanu Kaskinen 2009-08-16 21:25:48 +03:00

parent 2bb3eef414 01e4b61a91

commit bcaba0b1b4

134 changed files with 15076 additions and 12812 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1356

po/es.po

View file

File diff suppressed because it is too large Load diff