summaryrefslogtreecommitdiff
path: root/pacman-extra.conf
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-05-10 18:06:29 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-05-10 18:06:29 -0400
commit33730fc272bec6376a28d8f813e9e35ec4f84175 (patch)
tree0b85c3687a968fe83baa879952984f18f75f3061 /pacman-extra.conf
parent534d2015b45e013b37e1edbb997bd4df27d7b8fd (diff)
parent905198295dcb4fffcd16edff3fd7052a4cfc5788 (diff)
Merge remote-tracking branch 'arch/master'
Conflicts: lib/common.sh makechrootpkg.in
Diffstat (limited to 'pacman-extra.conf')
0 files changed, 0 insertions, 0 deletions