diff options
author | Ted Gould <ted@gould.cx> | 2010-08-11 15:55:25 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-08-11 15:55:25 -0500 |
commit | b7d28a11de1b283cffa4caea1abfb94e01db3fdd (patch) | |
tree | 12edca8958f0b5ac704f5724ac75a7263660498f /Makefile.am.marshal | |
parent | f34b5e562004795cfb4e09a7daa1d3cbb21f89f0 (diff) | |
parent | 7330f014db03391d1859f74b4bcbef13e587aa52 (diff) | |
download | ayatana-indicator-application-b7d28a11de1b283cffa4caea1abfb94e01db3fdd.tar.gz ayatana-indicator-application-b7d28a11de1b283cffa4caea1abfb94e01db3fdd.tar.bz2 ayatana-indicator-application-b7d28a11de1b283cffa4caea1abfb94e01db3fdd.zip |
Merging in the XLabel branch to handle conflicts.
Diffstat (limited to 'Makefile.am.marshal')
0 files changed, 0 insertions, 0 deletions