summaryrefslogtreecommitdiffstats
path: root/etc/Makefile.am
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-06-05 05:32:38 +0200
committerDan McGee <dan@archlinux.org>2007-06-05 05:32:38 +0200
commit26e3db423abeb4cb5704f89dc0fc50a767f19b47 (patch)
treed6574466cb8846d162719a49dc38df8f59acbca4 /etc/Makefile.am
parent466b79bf8f9a9b3f37a1a754b40320df9f2f1b4e (diff)
parent64d36db5f45db15997c6a3987d6f4b0ce147df27 (diff)
downloadpacman-26e3db423abeb4cb5704f89dc0fc50a767f19b47.tar.gz
pacman-26e3db423abeb4cb5704f89dc0fc50a767f19b47.tar.xz
Merge branch 'alpm.c_cleanup' into frontend_config
Conflicts: lib/libalpm/alpm.c
Diffstat (limited to 'etc/Makefile.am')
0 files changed, 0 insertions, 0 deletions