summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-16 02:40:22 +0100
committerDan McGee <dan@archlinux.org>2008-02-16 02:40:22 +0100
commit6b07b5d34512ef361ebf04395f07965cb80d0ec3 (patch)
treed67f27a25aeae00dedf5c6fab176576c06d1f5d9 /etc
parenta16608c6100e8620c03c94e34bb47256c2f5ee32 (diff)
parentbe95e4d8a008662eb0e19a3186953511551acec1 (diff)
downloadpacman-6b07b5d34512ef361ebf04395f07965cb80d0ec3.tar.gz
pacman-6b07b5d34512ef361ebf04395f07965cb80d0ec3.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/be_files.c lib/libalpm/package.c
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions