Author: rjek Date: Sun Aug 12 00:33:36 2007 New Revision: 3511 URL: http://source.netsurf-browser.org?rev=3511&view=rev Log: Merged revisions 3510 via svnmerge from svn://svn.netsurf-browser.org/trunk/netsurf ........ r3510 | rjek | 2007-08-12 00:32:21 +0100 (Sun, 12 Aug 2007) | 1 line Include new licencing terms in nsgtk about window ........ Modified: branches/1/netsurf/ (props changed) branches/1/netsurf/gtk/res/netsurf.glade Propchange: branches/1/netsurf/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Sun Aug 12 00:33:36 2007 @@ -1,1 +1,1 @@ -/trunk/netsurf:1-3295,3299,3301-3337,3345-3382,3384-3404,3408-3419,3421-3426,3428-3431,3434,3437,3439-3440,3442-3447,3449-3476,3478,3480-3481,3483-3484,3486,3493-3495,3498,3507-3508 +/trunk/netsurf:1-3295,3299,3301-3337,3345-3382,3384-3404,3408-3419,3421-3426,3428-3431,3434,3437,3439-3440,3442-3447,3449-3476,3478,3480-3481,3483-3484,3486,3493-3495,3498,3507-3508,3510 Modified: branches/1/netsurf/gtk/res/netsurf.glade URL: http://source.netsurf-browser.org/branches/1/netsurf/gtk/res/netsurf.glad... ============================================================================== --- branches/1/netsurf/gtk/res/netsurf.glade (original) +++ branches/1/netsurf/gtk/res/netsurf.glade Sun Aug 12 00:33:36 2007 @@ -4917,7 +4917,57 @@ <property name="left_margin">0</property> <property name="right_margin">0</property> <property name="indent">0</property> - <property name="text" translatable="yes"> GNU GENERAL PUBLIC LICENSE + <property name="text" translatable="yes">The source code, documentation, translatable messages files and UI +definitions contained within NetSurf are licensed under the following terms: + + NetSurf 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; version 2 of the License. + + In addition, as a special exception, permission is granted to link the + code of this release of NetSurf with the OpenSSL project's &quot;OpenSSL&quot; + library (or with modified versions of it that use the same licence as + the &quot;OpenSSL&quot; library), and distribute the linked executables. You must + obey the GNU General Public License version 2 in all respects for all of + the code used other than &quot;OpenSSL&quot;. If you modify the code, you may + extend this exception to your version of the code, but you are not + obligated to do so. If you do not wish to do so, delete this exception + statement from your version. + +All visual artwork contained within NetSurf is licensed under the terms of +the MIT License. + +The full text of the MIT and GPL licenses are provided in Annex A and +Annex B of this document. + + +Annex A: The MIT License +------------------------ + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the &quot;Software&quot;), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + +Annex B: The GNU General Public License +--------------------------------------- + + + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,