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

diff options

author	Dan McGee <dan@archlinux.org>	2011-01-12 09:23:24 -0600
committer	Dan McGee <dan@archlinux.org>	2011-01-12 09:23:24 -0600
commit	5615b716887960260016646c2d0f812806abe2ec (patch)
tree	f6c2324c711eb7ce00f8a1fff48d7857577d9c37 /scripts
parent	dd265921559b187cba59e83bfdbfda11bcec2f1e (diff)
parent	30f53cfe8d3f07bc9f350387b55ddf8579dd75e3 (diff)

Merge branch 'maint'

Conflicts: lib/libalpm/be_files.c

Diffstat (limited to 'scripts')

0 files changed, 0 insertions, 0 deletions