diff options
| author | Ted Gould <ted@gould.cx> | 2014-11-05 17:56:17 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-11-05 17:56:17 +0000 |
| commit | b9caf5671da45dad55e69f59fc3ce016057567fa (patch) | |
| tree | 05f4c79c23bff1fd757a06592f1d71e16c6a4994 /src/main.c | |
| parent | dec2d5350f47e52539941b45d394516066a19678 (diff) | |
| parent | 08bcdc3b069c4c5ce7cb2a769daa8573fce5cd5d (diff) | |
| download | ayatana-indicator-sound-b9caf5671da45dad55e69f59fc3ce016057567fa.tar.gz ayatana-indicator-sound-b9caf5671da45dad55e69f59fc3ce016057567fa.tar.bz2 ayatana-indicator-sound-b9caf5671da45dad55e69f59fc3ce016057567fa.zip | |
Manually merging branches to resolve conflicts Fixes: 1358340, 1373404, 1378564, 1378961, 1381871
Approved by: PS Jenkins bot
Diffstat (limited to 'src/main.c')
0 files changed, 0 insertions, 0 deletions