Public Git Hosting - pacman-ng.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f34864c 1a8c3e5)

commit	8de0631edbd1fd7681f6a924f5e166621328c13f
author	Dan McGee <dan@archlinux.org>
	Fri, 9 Mar 2012 00:08:15 +0000 (8 18:08 -0600)
committer	Dan McGee <dan@archlinux.org>
	Fri, 9 Mar 2012 00:08:15 +0000 (8 18:08 -0600)
tree	228db78143b109eeafdcd386354a2e09f561c854	tree \| snapshot (tar.gz zip)
parent	f34864cc9e4e755f2add7581419f4ec1c2525fe0	commit \| diff
parent	1a8c3e52d70bfa21ba108aa77179adf90401949d	commit \| diff

Merge branch 'maint'

Conflicts:
lib/libalpm/be_package.c

configure.ac	diff1 \|	diff2 \|	blob \| history
lib/libalpm/be_package.c	diff1 \|	diff2 \|	blob \| history
scripts/makepkg.sh.in	diff1 \|	diff2 \|	blob \| history
scripts/pacman-key.sh.in	diff1 \|	diff2 \|	blob \| history
scripts/repo-add.sh.in	diff1 \|	diff2 \|	blob \| history
src/pacman/sync.c	diff1 \|	diff2 \|	blob \| history

ngaba's pacman repo