summaryrefslogtreecommitdiffstats
path: root/doc/pacman.conf.5.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-24 01:22:07 -0600
committerDan McGee <dan@archlinux.org>2008-02-24 01:22:07 -0600
commit3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb (patch)
tree6b968cc50ea7395b02c043022da292732196339b /doc/pacman.conf.5.txt
parent3a6f62d4c711d2e05821094d02d7aca290cf15f9 (diff)
parent96f7613d15e46131bf8a4b93828ad70b041524d1 (diff)
downloadpacman-3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb.tar.xz
Merge branch 'maint'
Conflicts: src/pacman/callback.c
Diffstat (limited to 'doc/pacman.conf.5.txt')
0 files changed, 0 insertions, 0 deletions