summaryrefslogtreecommitdiffstats
path: root/etc/Makefile.am
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-09-20 19:09:10 +0200
committerDan McGee <dan@archlinux.org>2009-09-20 19:09:10 +0200
commit6bfca2fd14d07a18d7000d1f9dd998428036656f (patch)
treec766b1ea0071f17857a975b15f53a8f77909f46d /etc/Makefile.am
parentef3716877032941f7882c11c5a091abef95ef983 (diff)
parent338c6546ff86acbb25c1508439adfb89c3dea952 (diff)
downloadpacman-6bfca2fd14d07a18d7000d1f9dd998428036656f.tar.gz
pacman-6bfca2fd14d07a18d7000d1f9dd998428036656f.tar.xz
Merge branch 'maint'
Message updates made this one a bit messy, but nothing too bad. Conflicts: lib/libalpm/add.c lib/libalpm/remove.c
Diffstat (limited to 'etc/Makefile.am')
0 files changed, 0 insertions, 0 deletions