diff options
| author | Cody Russell <crussell@canonical.com> | 2009-12-11 10:46:30 -0600 |
|---|---|---|
| committer | Cody Russell <crussell@canonical.com> | 2009-12-11 10:46:30 -0600 |
| commit | 8de275389c7b33fc682da05432738a6730d67f6e (patch) | |
| tree | 0ddceaeb3f6219f49b9b77334d4c75a1788f324e /src/application-service-marshal.list | |
| parent | 5fe114ea67dd850e36c7903ea5a6c28d693f3dc3 (diff) | |
| parent | d3038937c5f5621da42952a026c61e1f5f74e83a (diff) | |
| download | libayatana-appindicator-8de275389c7b33fc682da05432738a6730d67f6e.tar.gz libayatana-appindicator-8de275389c7b33fc682da05432738a6730d67f6e.tar.bz2 libayatana-appindicator-8de275389c7b33fc682da05432738a6730d67f6e.zip | |
trunk merge, resolve conflicts
Diffstat (limited to 'src/application-service-marshal.list')
0 files changed, 0 insertions, 0 deletions