summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-01-02 22:48:52 -0600
committerDan McGee <dan@archlinux.org>2009-01-02 22:48:52 -0600
commitf8b689d48eb34cf81c22c854cd83595338d49d44 (patch)
treedc45d9e3638581640ac5bd131529b8c2754b1143 /.gitattributes
parentbd628274cc8db81704860e69894fcd217c2068d0 (diff)
parentc31fcfd833fc527a3774c7b1bc29686194d23942 (diff)
downloadpacman-f8b689d48eb34cf81c22c854cd83595338d49d44.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/dload.c po/it.po scripts/makepkg.sh.in
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions