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/lib/libalpm/log.c

diff options

author	Dan McGee <dan@archlinux.org>	2011-06-27 09:33:27 -0500
committer	Dan McGee <dan@archlinux.org>	2011-06-27 09:33:27 -0500
commit	77a09c92c66bd06440be0ccb75daf07c620acbee (patch)
tree	621e3b9181899773d411744522889ce8e673e7b1 /lib/libalpm/log.c
parent	51ed7dff0d30a5dcb73ce271e5d02bdb0d119cb9 (diff)
parent	e378170c2555b656ef87715d8284d038037ced5f (diff)

Merge branch 'maint'

Conflicts: lib/libalpm/conflict.c

Diffstat (limited to 'lib/libalpm/log.c')

0 files changed, 0 insertions, 0 deletions