diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-09-10 01:54:33 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-09-10 01:54:33 +0200 |
| commit | a41c510e42db7fc20b0e6abf7bc56a747e7d5a35 (patch) | |
| tree | 69ed51cd319c7cff5c83db9ae87f4b90ebbea397 /src/pulse/subscribe.h | |
| parent | f3879f8f3773255695a42a090771a570c36fb3b1 (diff) | |
| parent | 4f24a6258a1bef02b31b6b82d3ce0967fa5ab818 (diff) | |
Merge remote branch 'origin/master-tx'
Conflicts:
po/cs.po
po/kn.po
po/or.po
po/sr.po
po/sr@latin.po
po/te.po
po/uk.po
Diffstat (limited to 'src/pulse/subscribe.h')
0 files changed, 0 insertions, 0 deletions