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>	2008-02-24 01:22:07 -0600
committer	Dan McGee <dan@archlinux.org>	2008-02-24 01:22:07 -0600
commit	3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb (patch)
tree	6b968cc50ea7395b02c043022da292732196339b /scripts
parent	3a6f62d4c711d2e05821094d02d7aca290cf15f9 (diff)
parent	96f7613d15e46131bf8a4b93828ad70b041524d1 (diff)

Merge branch 'maint'

Conflicts: src/pacman/callback.c

Diffstat (limited to 'scripts')

0 files changed, 0 insertions, 0 deletions