summaryrefslogtreecommitdiff
path: root/doc/.gitignore
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-11 11:32:09 -0500
committerDan McGee <dan@archlinux.org>2011-08-11 11:35:29 -0500
commitdd865d298146ef77effb2110d7db172b3bffe9b0 (patch)
treec77aca742e8e88a3e00100e784d076ca5f281308 /doc/.gitignore
parentd0c64c41965d49ac840a747d009de85b7eb9e92e (diff)
parentc493eef643ecb3a54c79083c51a8975f816ed9de (diff)
Merge branch 'maint'
Conflicts: scripts/repo-add.sh.in
Diffstat (limited to 'doc/.gitignore')
0 files changed, 0 insertions, 0 deletions