Public Git Hosting - pacman-ng.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 202ade1 21a881e)

commit	efd8ae483fe587feccd32c90fbee474aa19a5557
author	Dan McGee <dan@archlinux.org>
	Fri, 15 Apr 2011 23:41:49 +0000 (15 18:41 -0500)
committer	Dan McGee <dan@archlinux.org>
	Fri, 15 Apr 2011 23:41:49 +0000 (15 18:41 -0500)
tree	02dfc2f4597d69dcaa18050b604f5c1df5450cd4	tree \| snapshot (tar.gz zip)
parent	202ade1398ca57070e56de24c3639f3048ecd784	commit \| diff
parent	21a881ec6875dccf42bd602496fa93c5a61f2640	commit \| diff

Merge branch 'maint'

Conflicts:
lib/libalpm/alpm.h
lib/libalpm/trans.c

Signed-off-by: Dan McGee <dan@archlinux.org>

lib/libalpm/alpm.h	diff1 \|	diff2 \|	blob \| history
lib/libalpm/be_package.c	diff1 \|	diff2 \|	blob \| history
lib/libalpm/db.c	diff1 \|	diff2 \|	blob \| history
lib/libalpm/deps.c	diff1 \|	diff2 \|	blob \| history
lib/libalpm/diskspace.c	diff1 \|	diff2 \|	blob \| history
lib/libalpm/dload.c	diff1 \|	diff2 \|	blob \| history
lib/libalpm/package.c	diff1 \|	diff2 \|	blob \| history
lib/libalpm/remove.c	diff1 \|	diff2 \|	blob \| history
lib/libalpm/trans.c	diff1 \|	diff2 \|	blob \| history
scripts/makepkg.sh.in	diff1 \|	diff2 \|	blob \| history
src/pacman/query.c	diff1 \|	diff2 \|	blob \| history

ngaba's pacman repo