Update mailmap and contributors

abitmore · abitmore · commit afe36253d500 · 2020-01-30T12:00:08.000Z
diff --git a/.mailmap b/.mailmap
@@ -1,4 +1,5 @@
-Alfredo Garcia <oxarbitrage@gmail.com>
+Alfredo Garcia <oxarbitrage@gmail.com> <oxarbitrage@gmail.com>
+Alfredo Garcia <oxarbitrage@gmail.com> <root@NC-PH-1346-07.web-hosting.com>
 Christopher Sanborn <23085117+christophersanborn@users.noreply.github.com>
 Chronos <chronos.crypto@gmail.com>
 Daniel Larimer <bytemaster@users.noreply.github.com> <dan.larimer@block.one>
@@ -27,6 +28,13 @@ Vikram Rajkumar <vikramrajkumar@users.noreply.github.com> <vikram@bitshares.org>
 Vikram Rajkumar <vikramrajkumar@users.noreply.github.com> <vikram@soledger.com>
 abitmore <abitmore@users.noreply.github.com>
 btcinshares <btcinshares@protonmail.com> <33876675+btcinshares@users.noreply.github.com>
-cifer <maintianyu@gmail.com> <cifer-lee@users.noreply.github.com>
-cifer <maintianyu@gmail.com> <mantianyu@gmail.com>
-朱礼廷 <zhuliting@gxb.io>
+Xiaodong Li <mantianyu@gmail.com> <cifer-lee@users.noreply.github.com>
+Xiaodong Li <mantianyu@gmail.com> <mantianyu@gmail.com>
+Xiaodong Li <mantianyu@gmail.com> <maintianyu@gmail.com>
+Xiaodong Li <mantianyu@gmail.com> <lixiaodongcifer@didichuxing.com>
+albert <393259066@qq.com> <393259066@qq.com>
+albert <393259066@qq.com> <zhuliting@gxb.io>
+bitcube <root@seed.cubeconnex.com>
+William <tmfc@homtail.com> <jinwei@gmail.com>
+William <tmfc@homtail.com> <tmfc@homtail.com>
+Roelandp <dnaleor@gmail.com>
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -13,14 +13,14 @@ Nathan Hourt <themodprobe@protonmail.com>
 Vikram Rajkumar <vikramrajkumar@users.noreply.github.com>
 Eric Frias <efrias@syncad.com>
 Valera Cogut <info@valeracogut.com>
-cifer <maintianyu@gmail.com>
+Xiaodong Li <mantianyu@gmail.com>
 Fabian Schuh <Fabian@chainsquad.com>
 manikey123 <mansiimohan@gmail.com>
 lubos.ilcik <lubos.ilcik@touch4it.com>
 Matias Romeo <matias.romeo@gmail.com>
 OpenLedger <service.github@openledger.info>
 Sigve Kvalsvik <bitsharesblocks@gmail.com>
-朱礼廷 <zhuliting@gxb.io>
+albert <393259066@qq.com>
 Ryan R. Fox <ryan@ryanrfox.com>
 Valentine Zavgorodnev <i@valzav.com>
 crypto-ape <43807588+crypto-ape@users.noreply.github.com>
@@ -39,11 +39,10 @@ Zapata <marco.tessari@gmail.com>
 btcinshares <btcinshares@protonmail.com>
 Anzhy Cherrnyavski <a.chernyavski@pixelplex.io>
 Tiago Peralta <tperalta82@gmail.com>
-albert <393259066@qq.com>
-root <root@NC-PH-1346-07.web-hosting.com>
 SahkanDesertHawk <panasiuki@gmail.com>
 Scott Howard <showard314@gmail.com>
 Tydus <Tydus@Tydus.org>
+William <tmfc@homtail.com>
 crazybits <crazybits@users.noreply.github.com>
 d.yakovitsky <d.yakovitsky@aetsoft.by>
 iHashFury <iPerky@users.noreply.github.com>
@@ -62,16 +61,13 @@ Karl Semich <0xloem@gmail.com>
 Ken Code <ken@BitShares-Munich.de>
 Krzysztof Szumny <krzysztof.szumny@stxnext.pl>
 Paul Brossier <piem@piem.org>
+Roelandp <dnaleor@gmail.com>
 Thomas Freedman <thom@ozarkholler.com>
 Troglodactyl <troglodactyl@gmail.com>
 VoR0220 <catalanor0220@gmail.com>
 alt <pch957@163.com>
 bangzi1001 <36911788+bangzi1001@users.noreply.github.com>
+bitcube <root@seed.cubeconnex.com>
 lafona <lafona@protonmail.com>
 liondani <liondani@gmx.com>
-lixiaodongcifer <lixiaodongcifer@didichuxing.com>
 lososeg <ya.lososeg@gmail.com>
-roelandp <dnaleor@gmail.com>
-root <root@seed.cubeconnex.com>
-william <jinwei@gmail.com>
-william <tmfc@homtail.com>

-Original file line number
+Diff line change
 -Alfredo Garcia <[email protected]>
 +Alfredo Garcia <[email protected]> <[email protected]>
 +Alfredo Garcia <[email protected]> <[email protected]>
 Christopher Sanborn <[email protected]>
 Chronos <[email protected]>
 Daniel Larimer <[email protected]> <[email protected]>
 Vikram Rajkumar <[email protected]> <[email protected]>
 abitmore <[email protected]>
 btcinshares <[email protected]> <[email protected]>
 -cifer <[email protected]> <[email protected]>
 -cifer <[email protected]> <[email protected]>
 -朱礼廷 <[email protected]>
 +Xiaodong Li <[email protected]> <[email protected]>
 +Xiaodong Li <[email protected]> <[email protected]>
 +Xiaodong Li <[email protected]> <[email protected]>
 +Xiaodong Li <[email protected]> <[email protected]>
 +albert <[email protected]> <[email protected]>
 +albert <[email protected]> <[email protected]>
 +bitcube <[email protected]>
 +William <[email protected]> <[email protected]>
 +William <[email protected]> <[email protected]>
 +Roelandp <[email protected]>
-Original file line number
+Diff line change
 Vikram Rajkumar <[email protected]>
 Eric Frias <[email protected]>
 Valera Cogut <[email protected]>
 -cifer <maintianyu@gmail.com>
 +Xiaodong Li <mantianyu@gmail.com>
 Fabian Schuh <[email protected]>
 manikey123 <[email protected]>
 lubos.ilcik <[email protected]>
 Matias Romeo <[email protected]>
 OpenLedger <[email protected]>
 Sigve Kvalsvik <[email protected]>
 -朱礼廷 <[email protected]>
 +albert <[email protected]>
 Ryan R. Fox <[email protected]>
 Valentine Zavgorodnev <[email protected]>
 crypto-ape <[email protected]>
 btcinshares <[email protected]>
 Anzhy Cherrnyavski <[email protected]>
 Tiago Peralta <[email protected]>
 -albert <[email protected]>
 -root <[email protected]>
 SahkanDesertHawk <[email protected]>
 Scott Howard <[email protected]>
 Tydus <[email protected]>
 +William <[email protected]>
 crazybits <[email protected]>
 d.yakovitsky <[email protected]>
 iHashFury <[email protected]>
 Ken Code <[email protected]>
 Krzysztof Szumny <[email protected]>
 Paul Brossier <[email protected]>
 +Roelandp <[email protected]>
 Thomas Freedman <[email protected]>
 Troglodactyl <[email protected]>
 VoR0220 <[email protected]>
 alt <[email protected]>
 bangzi1001 <[email protected]>
 +bitcube <[email protected]>
 lafona <[email protected]>
 liondani <[email protected]>
 -lixiaodongcifer <[email protected]>
 lososeg <[email protected]>
 -roelandp <[email protected]>
 -root <[email protected]>
 -william <[email protected]>
 -william <[email protected]>