Public Git Hosting - pacman-ng.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 8f30e1b 1744fe1)

commit	9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9
author	Dan McGee <dan@archlinux.org>
	Thu, 2 Jun 2011 22:33:56 +0000 (2 17:33 -0500)
committer	Dan McGee <dan@archlinux.org>
	Thu, 2 Jun 2011 22:34:12 +0000 (2 17:34 -0500)
tree	b108af2fb331391498e1260103d6d6caaf01154c	tree \| snapshot (tar.gz zip)
parent	8f30e1b110e5c7bf2ec3eb397fe6880a2c8ee0a9	commit \| diff
parent	1744fe12d4b29eff681995441c9565403348aaa2	commit \| diff

Merge branch 'maint'

Conflicts:
src/pacman/callback.c

configure.ac	diff1 \|	diff2 \|	blob \| history
scripts/repo-add.sh.in	diff1 \|	diff2 \|	blob \| history
src/pacman/callback.c	diff1 \|	diff2 \|	blob \| history
src/pacman/util.c	diff1 \|	diff2 \|	blob \| history
src/pacman/util.h	diff1 \|	diff2 \|	blob \| history

ngaba's pacman repo