aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-11-11 12:55:11 +0100
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-11-11 12:55:11 +0100
commit73af3f742f2085a1a21616edc92347b105f48e92 (patch)
treeecaddf5671562a295a8bdd8c7b4928489e825c5e /ChangeLog
parent5481d74daaf7b97898af7d97aca1239bdd380ff2 (diff)
parentd0c9ae776af81736a119de5172cc12336dfba96c (diff)
downloadayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.tar.gz
ayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.tar.bz2
ayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.zip
Fixed conflict
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions