summaryrefslogtreecommitdiffstats
path: root/scripts/pacman-key.sh.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-28 03:41:23 +0200
committerDan McGee <dan@archlinux.org>2011-03-28 03:41:23 +0200
commit3f269503d53811cf45037022a263f2447e427a0b (patch)
tree437753d28e59d3add63e48b4cfd4d77cd95e1cfc /scripts/pacman-key.sh.in
parent630b7b94c39ddc60d4e2b3c80d5d9f3101049b93 (diff)
parentea216d3f5a84814c512ab51ac37a4055b82032c3 (diff)
downloadpacman-3f269503d53811cf45037022a263f2447e427a0b.tar.gz
pacman-3f269503d53811cf45037022a263f2447e427a0b.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/deps.c
Diffstat (limited to 'scripts/pacman-key.sh.in')
0 files changed, 0 insertions, 0 deletions