summaryrefslogtreecommitdiffstats
path: root/scripts/.gitignore
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-05-20 17:41:21 -0500
committerDan McGee <dan@archlinux.org>2012-05-20 17:41:21 -0500
commit9f6a67fee71a63848f958212c1b5a2abd0f735a5 (patch)
treee33a982bca695119eb4ffe938e5b5acf42dad554 /scripts/.gitignore
parentfc9002188b588cda1f5362d6d15bd6996c532982 (diff)
parent5de465d63efbb82da6127ac927ad29b9c8b1b542 (diff)
downloadpacman-9f6a67fee71a63848f958212c1b5a2abd0f735a5.tar.xz
Merge branch 'maint'
Conflicts: scripts/pacman-key.sh.in
Diffstat (limited to 'scripts/.gitignore')
0 files changed, 0 insertions, 0 deletions