summaryrefslogtreecommitdiffstats
path: root/etc/pacman.conf.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-07-10 15:41:18 +0200
committerDan McGee <dan@archlinux.org>2012-07-10 15:41:18 +0200
commite41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (patch)
treecca5ca8e117ab536055696cba83960566b36f661 /etc/pacman.conf.in
parent392fffe24126c1d0404ead75c1743411fe65310a (diff)
parent5c1ba2d5fd5263525a0355cdce900b58dc41c916 (diff)
downloadpacman-e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8.tar.gz
pacman-e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8.tar.xz
Merge branch 'maint'
Conflicts: etc/makepkg.conf.in
Diffstat (limited to 'etc/pacman.conf.in')
0 files changed, 0 insertions, 0 deletions