]> code.delx.au - pulseaudio/commit
Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Wed, 5 Aug 2009 13:08:29 +0000 (15:08 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 5 Aug 2009 13:08:29 +0000 (15:08 +0200)
commit42f92a8087b2cefdee47439bcd0a79c7f883af03
tree240dd17252e5ff0a0a688da123f0ebb1e18a69c4
parent8483de4f2be22338eaa42d3b9bad6bf554644b61
parent19f2ffba49da3fba4daf1a1aba68c3ae35f9362b
Merge commit 'origin/master-tx'

Conflicts:
po/pl.po
po/pt.po
po/pt_BR.po
po/pt.po
po/pt_BR.po