Merge branch 'maint' - pacman - Archlinux32 fork of pacman

Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.

summary refs log tree commit diff

path: root/.mailmap

diff options

author	Dan McGee <dan@archlinux.org>	2012-03-16 12:08:10 -0500
committer	Dan McGee <dan@archlinux.org>	2012-03-16 12:08:10 -0500
commit	e6f72c61a098b52ea29e54b8eb4739a2ff81e6b0 (patch)
tree	f04692879dc63fe9f958500ebd646eb169d32fe4 /.mailmap
parent	573bd80f147ce90f21ef51fb8ca6f71e89cc3a74 (diff)
parent	f988aa6b32503f5d4003b1402089df74adf8b485 (diff)

Merge branch 'maint'

Conflicts: lib/libalpm/sync.c

Diffstat (limited to '.mailmap')

0 files changed, 0 insertions, 0 deletions