aboutsummaryrefslogtreecommitdiff
path: root/src/media-player-user.vala
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-10-21 15:16:58 +0200
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-10-21 15:16:58 +0200
commit4dbdcf30a0ed10019d3350293c4ac52040393640 (patch)
treefa01e697dee299506a91d1d9f41c2a61f429fcc9 /src/media-player-user.vala
parent6ee23e401d3847e609f1ef50e1736f69e6253608 (diff)
parent86c449a7125f3ff90dcac353c8a4ad5a8c2cc46e (diff)
downloadayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.gz
ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.bz2
ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.zip
Fixed conflict. Updated changelog to be in sync with trunk
Diffstat (limited to 'src/media-player-user.vala')
0 files changed, 0 insertions, 0 deletions