summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-10-22 02:29:47 +0200
committerDan McGee <dan@archlinux.org>2011-10-22 02:29:47 +0200
commit90ddcbe71d483884b7627237121b1dee05b07dd0 (patch)
tree3a7ab12ede83453d24747065f5f27a78c8c51fbf /.mailmap
parent33bb7dbd356bd1164a1bd6418c0615808fae13f7 (diff)
parentd6e3446e70bcda9c0f28d80110d588106daa4b5c (diff)
downloadpacman-90ddcbe71d483884b7627237121b1dee05b07dd0.tar.gz
pacman-90ddcbe71d483884b7627237121b1dee05b07dd0.tar.xz
Merge branch 'maint'
Conflicts: src/pacman/package.c Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions