Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge LICENSE.txt and COPYRIGHT.txt into just one file: COPYRIGHT.txt.

  • Loading branch information...
commit 8af6ee999a8fdd94725ada92a476523d4c4a3f71 1 parent 600863c
@shypike shypike authored
Showing with 10 additions and 20 deletions.
  1. +10 −2 COPYRIGHT.txt
  2. +0 −17 LICENSE.txt
  3. +0 −1  package.py
View
12 COPYRIGHT.txt
@@ -12,11 +12,19 @@ Current team:
Honorary member (and original author)
Gregor Kaufmann <tdian@users.sourceforge.net>
-SABnzbd comes with ABSOLUTELY NO WARRANTY.
+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-See GPL2.txt and GPL3.txt
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+See accompanying files GPL2.txt and GPL3.txt.
View
17 LICENSE.txt
@@ -1,17 +0,0 @@
-(c) Copyright 2007-2011 by "The SABnzbd-team" <team@sabnzbd.org>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-See accompanying files GPL2.txt and GPL3.txt.
View
1  package.py
@@ -287,7 +287,6 @@ def rename_file(folder, old, new):
'GPL3.txt',
'CHANGELOG.txt',
'COPYRIGHT.txt',
- 'LICENSE.txt',
'ISSUES.txt',
'nzbmatrix.txt',
'nzb.ico',
Please sign in to comment.
Something went wrong with that request. Please try again.