aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-09-08 16:19:37 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-09-08 16:19:37 -0500
commitee6e07ff8b0765a584b8424dc4801833ac86317e (patch)
tree1e529bd001164cd4c47989b11e0dd8faf89ac028 /tests
parent24b9a28725106d1762fcefb0652f2cb06ad9aa4c (diff)
downloadayatana-indicator-power-ee6e07ff8b0765a584b8424dc4801833ac86317e.tar.gz
ayatana-indicator-power-ee6e07ff8b0765a584b8424dc4801833ac86317e.tar.bz2
ayatana-indicator-power-ee6e07ff8b0765a584b8424dc4801833ac86317e.zip
sync with lp-1330037-add-upower-099-support to resolve merge conflicts
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions