Public Git Hosting - pacman-ng.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 115c038 b4f5a63)

commit	c7321a7b80aebeacb05ad5ab9d096779403b1758
author	Dan McGee <dan@archlinux.org>
	Mon, 13 Feb 2012 16:12:39 +0000 (13 10:12 -0600)
committer	Dan McGee <dan@archlinux.org>
	Mon, 13 Feb 2012 16:14:06 +0000 (13 10:14 -0600)
tree	8fa7f16abc7b7af0c24ba92ababfc5c145d35eed	tree \| snapshot (tar.gz zip)
parent	115c0381c235100d7b05d9751767017a9ee325c4	commit \| diff
parent	b4f5a63e7fee5d04949e290bd63e5f0e94bd211e	commit \| diff

Merge branch 'maint'

Conflicts:
lib/libalpm/sync.c
src/util/pactree.c

configure.ac	diff1 \|	diff2 \|	blob \| history
lib/libalpm/alpm.h	diff1 \|	diff2 \|	blob \| history
lib/libalpm/sync.c	diff1 \|	diff2 \|	blob \| history
scripts/makepkg.sh.in	diff1 \|	diff2 \|	blob \| history
src/pacman/pacman.c	diff1 \|	diff2 \|	blob \| history
src/pacman/util.c	diff1 \|	diff2 \|	blob \| history
src/util/pactree.c	diff1 \|	diff2 \|	blob \| history

ngaba's pacman repo