summaryrefslogtreecommitdiff
path: root/doc/pacman.conf.5.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-14 08:29:39 -0500
committerDan McGee <dan@archlinux.org>2011-06-14 08:29:39 -0500
commitfbb44a6e0d5d3c386420dded0442f4771dbaea7c (patch)
treee704eb9c6debe0cf600f2a8f65cd50b8ddce9e14 /doc/pacman.conf.5.txt
parent00a1b1deeb390d99c99d942ef4d8bfe1a943b02a (diff)
parent07e97a5f2c1e1039f35a7893d2be6abf07af690a (diff)
downloadpacman-fbb44a6e0d5d3c386420dded0442f4771dbaea7c.tar.xz
Merge branch 'maint'
Conflicts: doc/makepkg.conf.5.txt
Diffstat (limited to 'doc/pacman.conf.5.txt')
0 files changed, 0 insertions, 0 deletions