From f542a95a87b4cd19dd1d1fa43c70516768346709 Mon Sep 17 00:00:00 2001 From: "Ryan R. Fox" Date: Thu, 10 Jan 2019 14:00:56 -0500 Subject: [PATCH 1/4] Update copyright for 2019 --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index b65abcc737..e5ad2c3f83 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Copyright (c) 2015-2016 Cryptonomex Inc. -Copyright (c) 2015-2017 contributors +Copyright (c) 2015-2019 contributors The MIT License From cd334d003bc73854627385b67583c660e022c763 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Mon, 16 Sep 2019 08:03:59 +0200 Subject: [PATCH 2/4] Added CONTRIBUTORS + mailmap, assigned copyright to BBF --- .mailmap | 32 ++++++++++++++++++++ CONTRIBUTORS.txt | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE.txt | 2 +- 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000..4580a0218c --- /dev/null +++ b/.mailmap @@ -0,0 +1,32 @@ +Alfredo Garcia +Christopher Sanborn <23085117+christophersanborn@users.noreply.github.com> +Chronos +Daniel Larimer +Daniel Larimer +Daniel Larimer +Daniel Larimer +Eric Frias +Fabian Schuh +Fabian Schuh +John M. Jones +Ken Code +Matias Romeo +Nathan Hourt +Nathan Hourt +OpenLedger +OpenLedger <42674402+OpenLedgerApp@users.noreply.github.com> +Peter Conrad +Peter Conrad +Qi Xing +Ryan R. Fox +Ryan R. Fox +Sigve Kvalsvik +Valentine Zavgorodnev +Valera Cogut +Vikram Rajkumar +Vikram Rajkumar +abitmore +btcinshares <33876675+btcinshares@users.noreply.github.com> +cifer +cifer +朱礼廷 diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e69de29bb2..e0993fe6bf 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -0,0 +1,77 @@ +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 +Alfredo Garcia +theoreticalbts +Daniel Larimer +John M. Jones +Peter Conrad +Nathan Hourt +Vikram Rajkumar +Eric Frias +Valera Cogut +cifer +Fabian Schuh +manikey123 +lubos.ilcik +Matias Romeo +OpenLedger +Sigve Kvalsvik +朱礼廷 +Ryan R. Fox +Valentine Zavgorodnev +crypto-ape <43807588+crypto-ape@users.noreply.github.com> +Michael Vandeberg +James Calfee +takaaki7 +Nicolas Wack +Taconator +Christopher Sanborn <23085117+christophersanborn@users.noreply.github.com> +Qi Xing +Alexey Frolov +Anton Autushka +Chronos +Wei Yang +Zapata +btcinshares +Anzhy Cherrnyavski +Tiago Peralta +albert <393259066@qq.com> +root +SahkanDesertHawk +Scott Howard +Tydus +crazybits +d.yakovitsky +iHashFury +necklace +xuquan316 +BhuzOr +Blockchain Projects BV +Bruce Steedman +Charles Cooper +Erkan Yilmaz +Haruka Ma +Jaewoo Cho +Jose Marcial Vieira Bisneto +Jozef Knaperek +Karl Semich <0xloem@gmail.com> +Ken Code +Krzysztof Szumny +Paul Brossier +Thomas Freedman +Troglodactyl +VoR0220 +alt +bangzi1001 <36911788+bangzi1001@users.noreply.github.com> +lafona +liondani +lixiaodongcifer +lososeg +roelandp +root +william +william diff --git a/LICENSE.txt b/LICENSE.txt index e5ad2c3f83..8f4276b315 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Copyright (c) 2015-2016 Cryptonomex Inc. -Copyright (c) 2015-2019 contributors +Copyright (c) 2015-2019 BitShares Blockchain Foundation and others, see CONTRIBUTORS.txt The MIT License From bf688353901a352ebfaaccd04afd214ee8d6b159 Mon Sep 17 00:00:00 2001 From: abitmore Date: Thu, 30 Jan 2020 10:32:47 +0000 Subject: [PATCH 3/4] Update copyright for 2020, unassign BBF --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 8f4276b315..0ad9985bf9 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Copyright (c) 2015-2016 Cryptonomex Inc. -Copyright (c) 2015-2019 BitShares Blockchain Foundation and others, see CONTRIBUTORS.txt +Copyright (c) 2015-2020 contributors, see CONTRIBUTORS.txt The MIT License From afe36253d50064c290f35a1283893099bd697f11 Mon Sep 17 00:00:00 2001 From: abitmore Date: Thu, 30 Jan 2020 12:00:08 +0000 Subject: [PATCH 4/4] Update mailmap and contributors --- .mailmap | 16 ++++++++++++---- CONTRIBUTORS.txt | 14 +++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.mailmap b/.mailmap index 4580a0218c..f879602682 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,5 @@ -Alfredo Garcia +Alfredo Garcia +Alfredo Garcia Christopher Sanborn <23085117+christophersanborn@users.noreply.github.com> Chronos Daniel Larimer @@ -27,6 +28,13 @@ Vikram Rajkumar Vikram Rajkumar abitmore btcinshares <33876675+btcinshares@users.noreply.github.com> -cifer -cifer -朱礼廷 +Xiaodong Li +Xiaodong Li +Xiaodong Li +Xiaodong Li +albert <393259066@qq.com> <393259066@qq.com> +albert <393259066@qq.com> +bitcube +William +William +Roelandp diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e0993fe6bf..ca9f87ba5c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -13,14 +13,14 @@ Nathan Hourt Vikram Rajkumar Eric Frias Valera Cogut -cifer +Xiaodong Li Fabian Schuh manikey123 lubos.ilcik Matias Romeo OpenLedger Sigve Kvalsvik -朱礼廷 +albert <393259066@qq.com> Ryan R. Fox Valentine Zavgorodnev crypto-ape <43807588+crypto-ape@users.noreply.github.com> @@ -39,11 +39,10 @@ Zapata btcinshares Anzhy Cherrnyavski Tiago Peralta -albert <393259066@qq.com> -root SahkanDesertHawk Scott Howard Tydus +William crazybits d.yakovitsky iHashFury @@ -62,16 +61,13 @@ Karl Semich <0xloem@gmail.com> Ken Code Krzysztof Szumny Paul Brossier +Roelandp Thomas Freedman Troglodactyl VoR0220 alt bangzi1001 <36911788+bangzi1001@users.noreply.github.com> +bitcube lafona liondani -lixiaodongcifer lososeg -roelandp -root -william -william