aboutsummaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2015-07-24 21:31:26 +0200
committerJonas Bernoulli <jonas@bernoul.li>2015-07-24 21:31:26 +0200
commit8bed06133bf88ed15d046aba64acd4cfb9f47220 (patch)
tree3306cd853235027bdfe934189eef968fc5ab15c1 /.mailmap
parentcb84659ee7ab715c93a0ebaec2e13ca6ca9f683e (diff)
AUTHORS.md: update list of contributors
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap10
1 files changed, 6 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index a2ebb79..fe2f4e1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,19 +17,21 @@ Marius Vollmer <marius.vollmer@gmail.com> <marius.vollmer@uni-dortmund.de>
Marius Vollmer <marius.vollmer@gmail.com> <mvo@bright.(none)>
Marius Vollmer <marius.vollmer@gmail.com> <mvo@esdhcp03984.research.nokia.com>
Marius Vollmer <marius.vollmer@gmail.com> <mvo@manamana.(none)>
-Natalie Weizenbaum <nex342@gmail.com> Nathan Weizenbaum <nex342@gmail.com>
+Mark Karpov <markkarpov@opmbx.org>
+Natalie Weizenbaum <nex342@gmail.com> Nathan Weizenbaum
Noam Postavsky <npostavs@users.sourceforge.net>
-Óscar Fuentes <ofv@wanadoo.es> Oscar Fuentes <ofv@wanadoo.es>
+Óscar Fuentes <ofv@wanadoo.es> <ofv@wanadoo.es>
Óscar Fuentes <ofv@wanadoo.es> <oscar@nc10>
Óscar Fuentes <ofv@wanadoo.es> <oscar@qcore>
Peter J. Weisberg <pj@irregularexpressions.net>
Peter Vasil <mail@petervasil.net>
+Phil Sainty <phil@catalyst.net.nz> <phil-s@users.noreply.github.com>
Philippe Vaucher <philippe.vaucher@gmail.com> <philippe@stvs.ch>
Rémi Vanicat <vanicat@debian.org> <github.20.vanicat@mamber.net>
Rüdiger Sonderfeld <ruediger@c-plusplus.net> <ruediger@c-plusplus.de>
Sébastien Gross <seb@chezwam.org> <seb•ɑƬ•chezwam•ɖɵʈ•org>
-Syohei Yoshida <syohex@gmail.com> Syohei YOSHIDA <syohex@gmail.com>
-Wei Huang <weih@opera.com> HUANG Wei <weih@opera.com>
+Syohei Yoshida <syohex@gmail.com>
+Wei Huang <weih@opera.com>
Yann Hodique <yann.hodique@gmail.com> <hodiquey@vmware.com>
Yann Hodique <yann.hodique@gmail.com> <yann.hodique@bromium.com>
Yann Hodique <yann.hodique@gmail.com> <yhodique@vmware.com>