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

diff options

author	Dan McGee <dan@archlinux.org>	2010-12-12 19:53:20 -0600
committer	Dan McGee <dan@archlinux.org>	2010-12-12 19:53:20 -0600
commit	a35610beba1b12c37ec26ec878d3701dd669db42 (patch)
tree	62928bff67d6f63166da6a7736ab958f54297179 /depcomp
parent	4fb3cfc48f626f84329c78351d6a8710255a35e3 (diff)
parent	5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (diff)

Merge branch 'maint'

Conflicts: lib/libalpm/be_local.c lib/libalpm/trans.c

Diffstat (limited to 'depcomp')

0 files changed, 0 insertions, 0 deletions