diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-10-07 21:38:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-10-07 21:38:06 +0200 |
| commit | 5925d44013e2d559d1755176af0e26f69fc46458 (patch) | |
| tree | 2724bf186d3a19008990c924b3c68ce976e92dcc /src/pulse/simple.h | |
| parent | 3d7b76d159765a78e6e7288bd7aa5c276aa24e87 (diff) | |
| parent | 8c2a7c8707a556e4891383bc1786958304828dd9 (diff) | |
Merge commit 'origin/master-tx' into master-tx
Conflicts:
po/de.po
Diffstat (limited to 'src/pulse/simple.h')
0 files changed, 0 insertions, 0 deletions