summaryrefslogtreecommitdiffstats
path: root/doc/pacman.conf.5.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-12-30 16:41:46 +0100
committerDan McGee <dan@archlinux.org>2010-12-30 16:41:46 +0100
commit08d885fda5c9ccb3ac68faccc7c75e440ac71113 (patch)
tree3c494d8c593db3848d88a74b4e111710acfe0707 /doc/pacman.conf.5.txt
parent351250adb49bea470b88fca54dcfba789b58545c (diff)
parent6ddc115c7f52d6d172ca3879f96cc782bb526313 (diff)
downloadpacman-08d885fda5c9ccb3ac68faccc7c75e440ac71113.tar.gz
pacman-08d885fda5c9ccb3ac68faccc7c75e440ac71113.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/sync.c test/pacman/tests/ignore007.py
Diffstat (limited to 'doc/pacman.conf.5.txt')
0 files changed, 0 insertions, 0 deletions