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

diff options

author	Dan McGee <dan@archlinux.org>	2012-07-10 08:41:18 -0500
committer	Dan McGee <dan@archlinux.org>	2012-07-10 08:41:18 -0500
commit	e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (patch)
tree	cca5ca8e117ab536055696cba83960566b36f661 /COPYING
parent	392fffe24126c1d0404ead75c1743411fe65310a (diff)
parent	5c1ba2d5fd5263525a0355cdce900b58dc41c916 (diff)

Merge branch 'maint'

Conflicts: etc/makepkg.conf.in

Diffstat (limited to 'COPYING')

0 files changed, 0 insertions, 0 deletions