summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-01-19 15:21:36 -0500
committerAllan McRae <allan@archlinux.org>2013-01-28 23:38:46 +1000
commit6bbf6e8fa1e6dbb02bd70ab6d1e1283b00a05c8e (patch)
tree3fb5553db345f00f1ecc2e7bb338e4f6f61a48e0 /.mailmap
parent250aaefb27115e712b8de42cef601238ca22c260 (diff)
downloadpacman-6bbf6e8fa1e6dbb02bd70ab6d1e1283b00a05c8e.tar.xz
add doxygen comments to conflict.c
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions