Merge branch 'master' into 'master'

Use consistent copyright notices See merge request !83

Merge branch 'master' into 'master'
Use consistent copyright notices See merge request !83
0418863b · freetrader · e676256b · 5f1d6055 · 0418863b · 0418863b
Commit 0418863b authored Mar 08, 2020 by freetrader
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

src/qt/networkstyle.cpp src/qt/networkstyle.cpp +1 -1

src/qt/networkstyle.h src/qt/networkstyle.h +1 -1

test/functional/test_runner.py test/functional/test_runner.py +1 -2

No files found.
--- a/src/qt/networkstyle.cpp
+++ b/src/qt/networkstyle.cpp
-// Copyright (c) 2020 The Bitcoin developers
 // Copyright (c) 2014-2016 The Bitcoin Core developers
+// Copyright (c) 2020 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.


--- a/src/qt/networkstyle.h
+++ b/src/qt/networkstyle.h
-// Copyright (c) 2020 The Bitcoin developers
 // Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2020 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.


--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
 #!/usr/bin/env python3
 # Copyright (c) 2014-2019 The Bitcoin Core developers
-# Copyright (c) 2017 The Bitcoin developers
-# Copyright (c) 2020 Bitcoin Cash Node Developers 
+# Copyright (c) 2017-2020 The Bitcoin developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Run regression test suite.