diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
| commit | 95daf102dac37a69686f8a86bf7fe47cd442c7d6 (patch) | |
| tree | 3891a7075873c6eeb320fe0c8a572ca14655f5af /libindicator/indicator-service.xml | |
| parent | 4f4190f71f8495e5bcf6779d73157931572e42ac (diff) | |
| parent | 1cf6a9761db8beefc8d2a73c2cf9903264424c66 (diff) | |
| download | libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.gz libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.bz2 libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.zip | |
"bzr merge lp:indicator" + conflict resolution in tests suite
Diffstat (limited to 'libindicator/indicator-service.xml')
0 files changed, 0 insertions, 0 deletions