Merge branch 'maint' - pacman - Archlinux32 fork of pacman

Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.

summary refs log tree commit diff

path: root/pactest

diff options

author	Dan McGee <dan@archlinux.org>	2009-09-20 12:09:10 -0500
committer	Dan McGee <dan@archlinux.org>	2009-09-20 12:09:10 -0500
commit	6bfca2fd14d07a18d7000d1f9dd998428036656f (patch)
tree	c766b1ea0071f17857a975b15f53a8f77909f46d /pactest
parent	ef3716877032941f7882c11c5a091abef95ef983 (diff)
parent	338c6546ff86acbb25c1508439adfb89c3dea952 (diff)

Merge branch 'maint'

Message updates made this one a bit messy, but nothing too bad. Conflicts: lib/libalpm/add.c lib/libalpm/remove.c

Diffstat (limited to 'pactest')

0 files changed, 0 insertions, 0 deletions