Skip to content

Commit e6ff110

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#26810: doc: remove nonexistent files from copyright
4bb91be debian: remove nonexistent files from copyright (fanquake) Pull request description: The removed files were dropped during a secp256k1 subtree update. Top commit has no ACKs. Tree-SHA512: 19ef1cf76908b5468265cc25b76abf8cf3a1dd0d5f7390f9cf4c5cd4c421c8cb04b5991ded7102add896d06555696a8059df37fd1d8f7374487a12dfa594c9cd
2 parents 01ec530 + 4bb91be commit e6ff110

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

contrib/debian/copyright

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ Copyright: 2010-2011, Jonas Smedegaard <dr@jones.dk>
1515
2011, Matt Corallo <matt@bluematt.me>
1616
License: GPL-2+
1717

18-
Files: src/secp256k1/build-aux/m4/ax_jni_include_dir.m4
19-
Copyright: 2008 Don Anderson <dda@sleepycat.com>
20-
License: GNU-All-permissive-License
21-
22-
Files: src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4
23-
Copyright: 2008 Paolo Bonzini <bonzini@gnu.org>
24-
License: GNU-All-permissive-License
25-
2618
Files: src/qt/res/icons/add.png
2719
src/qt/res/icons/address-book.png
2820
src/qt/res/icons/chevron.png
@@ -112,12 +104,6 @@ License: Expat
112104
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
113105
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
114106

115-
License: GNU-All-permissive-License
116-
Copying and distribution of this file, with or without modification, are
117-
permitted in any medium without royalty provided the copyright notice
118-
and this notice are preserved. This file is offered as-is, without any
119-
warranty.
120-
121107
License: GPL-2+
122108
This program is free software; you can redistribute it and/or modify it
123109
under the terms of the GNU General Public License as published by the

0 commit comments

Comments
 (0)