]> code.delx.au - pulseaudio/commit
Merge branch 'master-tx'
authorLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2009 13:32:33 +0000 (15:32 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2009 13:32:33 +0000 (15:32 +0200)
commit638f9a561e8353ae9bd7e07e4f42e4c4f53f617e
treec5a353a272eb8a590fd3a9233cba169e9ed051e7
parent88d5749f6ae8d391963a12a6221f006de2947e50
parent0aca5ad3c09ea3e2202209e17808ec1bb86e5ac2
Merge branch 'master-tx'

Conflicts:
po/ca.po
po/cs.po
po/de.po
po/es.po
po/pl.po
po/es.po