aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2017-09-28 20:01:00 +0200
committerWladimir J. van der Laan <[email protected]>2017-09-28 20:01:21 +0200
commita72003d794f39230db476d4f358eb244b7cb2d36 (patch)
tree0eb689083378ee2a33c1590669203a0f0c670249
parentMerge #10663: net: split resolve out of connect (diff)
parentPut back inadvertently removed copyright notices (diff)
downloaddiscoin-a72003d794f39230db476d4f358eb244b7cb2d36.tar.xz
discoin-a72003d794f39230db476d4f358eb244b7cb2d36.zip
Merge #11318: Put back inadvertently removed copyright notices
d552ed6 Put back inadvertently removed copyright notices (Paul Berg) Pull request description: In an abundance of caution this restores "Bitcoin Developers" to the COPYING file in case there were contributors before that point in time that would object to the current label. It's harmless and more pedantically correct. (Change extracted from the Bitcoin-abc github) Tree-SHA512: ea71645fbca5548bcae750b9bb7c7cc56791d8c8d2574b778fa1666e09abad23b30fcb434f0d92c52a2eb7d7e89caa32695dff3a5a99a2ab43ed0f3636436677
-rw-r--r--COPYING1
1 files changed, 1 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index c6203c0f7..45d51c3c7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,7 @@
The MIT License (MIT)
Copyright (c) 2009-2017 The Bitcoin Core developers
+Copyright (c) 2009-2017 Bitcoin Developers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal