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/missing

diff options

author	Dan McGee <dan@archlinux.org>	2008-04-19 16:18:40 -0500
committer	Dan McGee <dan@archlinux.org>	2008-04-19 16:18:40 -0500
commit	423820b34c018e655aac5836873fef8dc475bd74 (patch)
tree	690c72ae87a207870b9b0eaa6eec130de8978d37 /missing
parent	7a873a8f1284058c968c5d8026fbde7867913cb5 (diff)
parent	c465d9e848b19b495259c7021a583c29fba92b44 (diff)

Merge branch 'maint'

Conflicts: pactest/pmtest.py

Diffstat (limited to 'missing')

0 files changed, 0 insertions, 0 deletions