aboutsummaryrefslogtreecommitdiff
path: root/src/application-service-marshal.list
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-08-05 16:35:25 -0500
committerTed Gould <ted@gould.cx>2010-08-05 16:35:25 -0500
commitb1daa47acf4d6114e7d4703e0ebe5550b0972e21 (patch)
treedc60489a01ba02880f6b01c8786d731b87a9e8a0 /src/application-service-marshal.list
parent23e9b56c533e25febfa8c83c353492403cb1b4d5 (diff)
parent9291697e3e6d4270a7f6200c0dc3d85743feb6d2 (diff)
downloadlibayatana-appindicator-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.tar.gz
libayatana-appindicator-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.tar.bz2
libayatana-appindicator-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.zip
Updating to trunk and resolve conflicts
Diffstat (limited to 'src/application-service-marshal.list')
0 files changed, 0 insertions, 0 deletions