aboutsummaryrefslogtreecommitdiff
path: root/src/app-indicator.h
diff options
context:
space:
mode:
authorSense Egbert Hofstede <sense@ubuntu.com>2010-09-21 22:18:22 +0200
committerSense Egbert Hofstede <sense@ubuntu.com>2010-09-21 22:18:22 +0200
commitf8bbae1007b87aee3251afe0e0ee4f9950dadd71 (patch)
tree62522a484d088cada5794c0358a033e727e5ddf6 /src/app-indicator.h
parente9ed8cb1050236d27ce749ea28fcdd5652ec8e2e (diff)
parent1be18c59d8366b80291977e93f97847ba23eca0e (diff)
downloadayatana-indicator-application-f8bbae1007b87aee3251afe0e0ee4f9950dadd71.tar.gz
ayatana-indicator-application-f8bbae1007b87aee3251afe0e0ee4f9950dadd71.tar.bz2
ayatana-indicator-application-f8bbae1007b87aee3251afe0e0ee4f9950dadd71.zip
Resolving conflict when merging with trunk
Diffstat (limited to 'src/app-indicator.h')
0 files changed, 0 insertions, 0 deletions