aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMirco Müller <mirco.mueller@ubuntu.com>2014-10-07 02:50:50 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-10-07 02:50:50 +0000
commit9953698317f1ab0ebcc39b28b2e57f6b257b05c2 (patch)
treea98ca2c193795e1aa99500c911ea65a63f4edffa /cmake
parentd491e77f567394df9ce527b8de844b7f9e434966 (diff)
parentc0cecdcd99352f2a9b5ecb1d5da599bf4c3d49f7 (diff)
downloadayatana-indicator-sound-9953698317f1ab0ebcc39b28b2e57f6b257b05c2.tar.gz
ayatana-indicator-sound-9953698317f1ab0ebcc39b28b2e57f6b257b05c2.tar.bz2
ayatana-indicator-sound-9953698317f1ab0ebcc39b28b2e57f6b257b05c2.zip
Merge trunk into older branches to resolve conflicts.
Diffstat (limited to 'cmake')
0 files changed, 0 insertions, 0 deletions