diff options
author | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
---|---|---|
committer | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
commit | bf2aab363e93263b1615f1811524fb22b14bf34b (patch) | |
tree | 406500af69bd6555eb4e4dc63e3711bd341bb6b4 /Makefile.am.coverage | |
parent | f10353bc4208a48339cdc1e0656361b16636a3e2 (diff) | |
parent | f90c7c21d0e82779356eaa8ae471703cda45d7cc (diff) | |
download | ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.gz ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.bz2 ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.zip |
Merge trunk, resolving Makefile conflict.
Diffstat (limited to 'Makefile.am.coverage')
0 files changed, 0 insertions, 0 deletions