summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-01-08 19:14:04 +0100
committerDan McGee <dan@archlinux.org>2012-01-08 19:14:04 +0100
commit4f02b98338437b9395addb29000893b91d1ae21e (patch)
tree986568d1e64bea1bde6ff287ed5a2629e7f8136f /etc
parent7f51ba99ae6db204d69ce271cd5cc4e959135738 (diff)
parent73d0d743bda5367fcab2453bbe21c15e481150c2 (diff)
downloadpacman-4f02b98338437b9395addb29000893b91d1ae21e.tar.gz
pacman-4f02b98338437b9395addb29000893b91d1ae21e.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/signing.c Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions