Merge pull request #1525 from bitshares/copyright-update-develop

abitmore · web-flow · commit 7fe004f5f1f2 · 2020-01-30T13:53:50.000+01:00
Update copyright for 2020
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,40 @@
+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>
+Daniel Larimer <bytemaster@users.noreply.github.com> <dan@bitshares.org>
+Daniel Larimer <bytemaster@users.noreply.github.com> <dan@invictus-innovations.com>
+Daniel Larimer <bytemaster@users.noreply.github.com> <dlarimer@invictus-innovations.com>
+Eric Frias <efrias@syncad.com>
+Fabian Schuh <Fabian@chainsquad.com> <mail@xeroc.org>
+Fabian Schuh <Fabian@chainsquad.com> <xeroc@chainsquad.com>
+John M. Jones <jmjatlanta@gmail.com>
+Ken Code <ken@BitShares-Munich.de>
+Matias Romeo <matias.romeo@gmail.com>
+Nathan Hourt <themodprobe@protonmail.com> <nat.hourt@gmail.com>
+Nathan Hourt <themodprobe@protonmail.com> <nathan@followmyvote.com>
+OpenLedger <service.github@openledger.info> <service.github@openledger.info>
+OpenLedger <service.github@openledger.info> <42674402+OpenLedgerApp@users.noreply.github.com>
+Peter Conrad <conrad@quisquis.de> <cyrano@quisquis.de>
+Peter Conrad <conrad@quisquis.de> <github.com@quisquis.de>
+Qi Xing <cwyyprog@163.com> <cwyyprog@163.com>
+Ryan R. Fox <ryan@ryanrfox.com> <ryan@ryanrfox.com>
+Ryan R. Fox <ryan@ryanrfox.com> <ryanRfox@users.noreply.github.com>
+Sigve Kvalsvik <bitsharesblocks@gmail.com> <sigvekvalsvik@gmail.com>
+Valentine Zavgorodnev <i@valzav.com>
+Valera Cogut <info@valeracogut.com> <valerakogut@gmail.com>
+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>
+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
@@ -0,0 +1,73 @@
+Contributors to this repository. Update with
+  head -5 CONTRIBUTORS.txt >contrib.tmp && git shortlog -s -e -n | cut -f 2 >>contrib.tmp && mv contrib.tmp CONTRIBUTORS.txt
+
+==============================================================================
+
+abitmore <abitmore@users.noreply.github.com>
+Alfredo Garcia <oxarbitrage@gmail.com>
+theoreticalbts <theoreticalbts@users.noreply.github.com>
+Daniel Larimer <bytemaster@users.noreply.github.com>
+John M. Jones <jmjatlanta@gmail.com>
+Peter Conrad <conrad@quisquis.de>
+Nathan Hourt <themodprobe@protonmail.com>
+Vikram Rajkumar <vikramrajkumar@users.noreply.github.com>
+Eric Frias <efrias@syncad.com>
+Valera Cogut <info@valeracogut.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>
+albert <393259066@qq.com>
+Ryan R. Fox <ryan@ryanrfox.com>
+Valentine Zavgorodnev <i@valzav.com>
+crypto-ape <43807588+crypto-ape@users.noreply.github.com>
+Michael Vandeberg <vandeberg@cryptonomex.com>
+James Calfee <james@jcalfee.info>
+takaaki7 <nakama67006700@gmail.com>
+Nicolas Wack <wackou@gmail.com>
+Taconator <TheTaconator@users.noreply.github.com>
+Christopher Sanborn <23085117+christophersanborn@users.noreply.github.com>
+Qi Xing <cwyyprog@163.com>
+Alexey Frolov <alexey.frolov@aetsoft.by>
+Anton Autushka <a.autushka@aetsoft.by>
+Chronos <chronos.crypto@gmail.com>
+Wei Yang <richard.weiyang@gmail.com>
+Zapata <marco.tessari@gmail.com>
+btcinshares <btcinshares@protonmail.com>
+Anzhy Cherrnyavski <a.chernyavski@pixelplex.io>
+Tiago Peralta <tperalta82@gmail.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>
+necklace <necklace@163.com>
+xuquan316 <xuquan316@vip.qq.com>
+BhuzOr <giaquinta.adriano@gmail.com>
+Blockchain Projects BV <info@blockchainprojectsbv.com>
+Bruce Steedman <MatzFan@users.noreply.github.com>
+Charles Cooper <cooper.charles.m@gmail.com>
+Erkan Yilmaz <erkan77@gmail.com>
+Haruka Ma <mrx@hcc.im>
+Jaewoo Cho <clayop@gmail.com>
+Jose Marcial Vieira Bisneto <marcial.vieirab@gmail.com>
+Jozef Knaperek <jknaperek@gmail.com>
+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>
+lososeg <ya.lososeg@gmail.com>
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,5 +1,5 @@
 Copyright (c) 2015-2016 Cryptonomex Inc. <contact@cryptonomex.com>
-Copyright (c) 2015-2017 contributors <CONTRIBUTORS.txt>
+Copyright (c) 2015-2020 contributors, see CONTRIBUTORS.txt
 
 The MIT License
 

-Original file line number
+Diff line change
 +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]>
 +Daniel Larimer <[email protected]> <[email protected]>
 +Daniel Larimer <[email protected]> <[email protected]>
 +Daniel Larimer <[email protected]> <[email protected]>
 +Eric Frias <[email protected]>
 +Fabian Schuh <[email protected]> <[email protected]>
 +Fabian Schuh <[email protected]> <[email protected]>
 +John M. Jones <[email protected]>
 +Ken Code <[email protected]>
 +Matias Romeo <[email protected]>
 +Nathan Hourt <[email protected]> <[email protected]>
 +Nathan Hourt <[email protected]> <[email protected]>
 +OpenLedger <[email protected]> <[email protected]>
 +OpenLedger <[email protected]> <[email protected]>
 +Peter Conrad <[email protected]> <[email protected]>
 +Peter Conrad <[email protected]> <[email protected]>
 +Qi Xing <[email protected]> <[email protected]>
 +Ryan R. Fox <[email protected]> <[email protected]>
 +Ryan R. Fox <[email protected]> <[email protected]>
 +Sigve Kvalsvik <[email protected]> <[email protected]>
 +Valentine Zavgorodnev <[email protected]>
 +Valera Cogut <[email protected]> <[email protected]>
 +Vikram Rajkumar <[email protected]> <[email protected]>
 +Vikram Rajkumar <[email protected]> <[email protected]>
 +abitmore <[email protected]>
 +btcinshares <[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]>