aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-28 14:38:39 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-06-28 14:38:39 -0500
commitc62d5ade70d276f1d50e63cc0cb9c4311d6c9cea (patch)
treed6e0c9555e5b13a6df87fcd617cb3cc3a4c86cc1 /src
parent4850b1b6ba8a1438d8c0903592108fcefc35235e (diff)
parentbb9304ef80222c41dec17418f745fdb98939da25 (diff)
downloadayatana-indicator-session-c62d5ade70d276f1d50e63cc0cb9c4311d6c9cea.tar.gz
ayatana-indicator-session-c62d5ade70d276f1d50e63cc0cb9c4311d6c9cea.tar.bz2
ayatana-indicator-session-c62d5ade70d276f1d50e63cc0cb9c4311d6c9cea.zip
sync with trunk to resolve conflicts
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions