diff options
author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 12:57:19 -0500 |
---|---|---|
committer | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 12:57:19 -0500 |
commit | 1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7 (patch) | |
tree | e6070a75b148a3c49aaa29c4b2cefcc9c886072e /Makefile.am | |
parent | ee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff) | |
parent | 6a86412258be37bb971c41b8f0ebd0a19a1463d2 (diff) | |
download | libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.gz libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.bz2 libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.zip |
resolve conflicts on acinclude.m4
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions