diff options
| author | Sense Egbert Hofstede <sense@ubuntu.com> | 2010-09-21 22:18:22 +0200 |
|---|---|---|
| committer | Sense Egbert Hofstede <sense@ubuntu.com> | 2010-09-21 22:18:22 +0200 |
| commit | f8bbae1007b87aee3251afe0e0ee4f9950dadd71 (patch) | |
| tree | 62522a484d088cada5794c0358a033e727e5ddf6 /src/app-indicator.h | |
| parent | e9ed8cb1050236d27ce749ea28fcdd5652ec8e2e (diff) | |
| parent | 1be18c59d8366b80291977e93f97847ba23eca0e (diff) | |
| download | ayatana-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