r16366 by mrdocs - resolves #9587 updated copyright doc

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 16 10:58:51 CET 2011


Author: mrdocs
Date: Wed Feb 16 09:58:50 2011
New Revision: 16366

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16366
Log:
resolves #9587 updated copyright doc

Modified:
    branches/Version135/Scribus/scribus/doc/en/scribuscopyright.html

Modified: branches/Version135/Scribus/scribus/doc/en/scribuscopyright.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16366&path=/branches/Version135/Scribus/scribus/doc/en/scribuscopyright.html
==============================================================================
--- branches/Version135/Scribus/scribus/doc/en/scribuscopyright.html (original)
+++ branches/Version135/Scribus/scribus/doc/en/scribuscopyright.html Wed Feb 16 09:58:50 2011
@@ -1,6 +1,6 @@
 <qt>
 <title>Scribus Copyright</title>
-<p>Scribus Copyright 2001-2008 Franz Schmid and rest of the members of the Scribus Team.  The "Scribus Team" is informally defined as the following people:   Franz Schmid, Peter Linnell, Paul Johnson, Craig Bradney, Petr Vanek, Riku Leino, Craig Ringer, Andreas Vox, Jean Ghali, Hermann Kraus and Christoph Sch&auml;fer.</p>
+<p>Scribus Copyright 2001-2011 Franz Schmid and rest of the members of the Scribus Team.  The "Scribus Team" is informally defined as the following people:   Franz Schmid, Peter Linnell, Paul Johnson, Craig Bradney, Petr Vanek, Riku Leino, Craig Ringer, Andreas Vox, Jean Ghali, Hermann Kraus, Christoph Sch&auml;fer and Pierre Marchand.</p>
 
 <p>This program is free software; you can redistribute it and/or modify it under the terms of the <a href=http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>GNU General Public License</a> as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</p>
 
@@ -8,9 +8,6 @@
 
 <p>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., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
 
-<p>In addition, as a special exception, the listed copyright holders above give permission to link the code of this program with the Trolltech AS Qt3 Commercially Licensed Dynamic Link Libraries  (or with modified versions of Trolltech AS Qt3 Commercially Licensed Dynamic Link Libraries that use the same license as Trolltech AS Qt3 Commercially Licensed Dynamic Link Libraries), and distribute linked combinations including the two. You must obey the GNU General Public  License in all respects for all of the code used other than Trolltech AS Qt3 Commercially Licensed Dynamic Link Libraries. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.</p>
-
-
 <p>Antiword, which is shipped with the Windows version of Scribus is a separately licensed program under the GPL and the copyright license is included with the program.</p>
 
 <p>The hyphenation dictionaries are covered by their own copyrights and licenses. Those are included with the hyphenation files.</p>




More information about the scribus-commit mailing list