summaryrefslogtreecommitdiff
path: root/test/pacman
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-01-30 22:00:26 -0600
committerDan McGee <dan@archlinux.org>2012-01-30 22:00:26 -0600
commit4f54bde4390d6d4302273a835e79ab1f2827adf8 (patch)
tree6d0484e190ef4927e814524b2b8a46d9aa851315 /test/pacman
parent9aa4d9a7b981e48a42203d4c07f729c8b890c62f (diff)
parent9d1e8084dfa0a1ebae6c37e3b839289cb905116f (diff)
Merge branch 'maint'
Conflicts: scripts/makepkg.sh.in
Diffstat (limited to 'test/pacman')
0 files changed, 0 insertions, 0 deletions