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/missing

diff options

author	Dan McGee <dan@archlinux.org>	2012-03-08 18:08:15 -0600
committer	Dan McGee <dan@archlinux.org>	2012-03-08 18:08:15 -0600
commit	8de0631edbd1fd7681f6a924f5e166621328c13f (patch)
tree	228db78143b109eeafdcd386354a2e09f561c854 /missing
parent	f34864cc9e4e755f2add7581419f4ec1c2525fe0 (diff)
parent	1a8c3e52d70bfa21ba108aa77179adf90401949d (diff)

Merge branch 'maint'

Conflicts: lib/libalpm/be_package.c

Diffstat (limited to 'missing')

0 files changed, 0 insertions, 0 deletions