summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-10-13 18:25:09 +0200
committerDan McGee <dan@archlinux.org>2011-10-13 18:25:50 +0200
commitff8704635440fe890ac8621722cc8301a3875e48 (patch)
tree2e932feb61e23808c2d68c347381f4fa3e81f7f7 /.gitignore
parent35e6136f4b1b45a7cb736ca0608da7f44c74b233 (diff)
parent04fd320e97770911894fb06ba98f3c17fc30c7d9 (diff)
downloadpacman-ff8704635440fe890ac8621722cc8301a3875e48.tar.gz
pacman-ff8704635440fe890ac8621722cc8301a3875e48.tar.xz
Merge branch 'maint'
Conflicts: src/pacman/util.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions