From c0e64ad7d474ded7c9ed0d8836106e69aad0203e Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 30 Aug 2004 13:23:23 +0000 Subject: [PATCH] Credit Malcolm Smith in the copyrights. git-svn-id: svn://svn.tartarus.org/sgt/putty@4518 cda61777-01e9-0310-a592-d414129be87e --- LICENCE | 2 +- doc/licence.but | 4 ++-- mac/mac_res.r | 4 ++-- pageant.rc | 45 +++++++++++++++++++++++---------------------- puttygen.rc | 45 +++++++++++++++++++++++---------------------- unix/gtkdlg.c | 2 +- win_res.rc | 51 ++++++++++++++++++++++++++------------------------- 7 files changed, 78 insertions(+), 75 deletions(-) diff --git a/LICENCE b/LICENCE index bc5db285..6e889f8f 100644 --- a/LICENCE +++ b/LICENCE @@ -2,7 +2,7 @@ PuTTY is copyright 1997-2004 Simon Tatham. Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, -Justin Bradford, Ben Harris, and CORE SDI S.A. +Justin Bradford, Ben Harris, Malcolm Smith, and CORE SDI S.A. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files diff --git a/doc/licence.but b/doc/licence.but index a0eb79b8..76368092 100644 --- a/doc/licence.but +++ b/doc/licence.but @@ -1,4 +1,4 @@ -\versionid $Id: licence.but,v 1.6 2004/01/01 16:47:48 simon Exp $ +\versionid $Id: licence.but,v 1.7 2004/08/30 13:23:23 simon Exp $ \A{licence} PuTTY Licence @@ -6,7 +6,7 @@ PuTTY is copyright 1997-2004 Simon Tatham. Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, -Justin Bradford, and CORE SDI S.A. +Justin Bradford, Ben Harris, Malcolm Smith, and CORE SDI S.A. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files diff --git a/mac/mac_res.r b/mac/mac_res.r index f30c72bb..cdd3ca7f 100644 --- a/mac/mac_res.r +++ b/mac/mac_res.r @@ -1,4 +1,4 @@ -/* $Id: mac_res.r,v 1.40 2004/01/01 16:47:48 simon Exp $ */ +/* $Id: mac_res.r,v 1.41 2004/08/30 13:23:23 simon Exp $ */ /* * Copyright (c) 1999, 2002, 2003 Ben Harris * All rights reserved. @@ -1096,7 +1096,7 @@ resource 'TEXT' (wLicence, "licence", purgeable) { "\n" "Portions copyright Robert de Bath, Joris van Rantwijk, Delian" "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry," - "Justin Bradford, Ben Harris, and CORE SDI S.A.\n" + "Justin Bradford, Ben Harris, Malcolm Smith, and CORE SDI S.A.\n" "\n" "Permission is hereby granted, free of charge, to any person " "obtaining a copy of this software and associated documentation " diff --git a/pageant.rc b/pageant.rc index 4fbbe8bf..f271db68 100644 --- a/pageant.rc +++ b/pageant.rc @@ -61,40 +61,41 @@ BEGIN END /* No accelerators used */ -214 DIALOG DISCARDABLE 50, 50, 226, 255 +214 DIALOG DISCARDABLE 50, 50, 226, 263 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PuTTY Licence" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 98, 235, 44, 14 + DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14 LTEXT "Copyright \251 1997-2004 Simon Tatham", 1000, 10, 10, 206, 8 LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8 LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8 - LTEXT "Barry, Justin Bradford, Ben Harris, and CORE SDI S.A.", 1003, 10, 42, 206, 8 + LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, and CORE", 1003, 10, 42, 206, 8 + LTEXT "SDI S.A.", 1004, 10, 50, 206, 8 - LTEXT "Permission is hereby granted, free of charge, to any person", 1004, 10, 58, 206, 8 - LTEXT "obtaining a copy of this software and associated documentation", 1005, 10, 66, 206, 8 - LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1006, 10, 74, 206, 8 - LTEXT "including without limitation the rights to use, copy, modify, merge,", 1007, 10, 82, 206, 8 - LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1008, 10, 90, 206, 8 - LTEXT "and to permit persons to whom the Software is furnished to do so,", 1009, 10, 98, 206, 8 - LTEXT "subject to the following conditions:", 1010, 10, 106, 206, 8 + LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8 + LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8 + LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1007, 10, 82, 206, 8 + LTEXT "including without limitation the rights to use, copy, modify, merge,", 1008, 10, 90, 206, 8 + LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1009, 10, 98, 206, 8 + LTEXT "and to permit persons to whom the Software is furnished to do so,", 1010, 10, 106, 206, 8 + LTEXT "subject to the following conditions:", 1011, 10, 114, 206, 8 - LTEXT "The above copyright notice and this permission notice shall be", 1011, 10, 122, 206, 8 - LTEXT "included in all copies or substantial portions of the Software.", 1012, 10, 130, 206, 8 + LTEXT "The above copyright notice and this permission notice shall be", 1012, 10, 130, 206, 8 + LTEXT "included in all copies or substantial portions of the Software.", 1013, 10, 138, 206, 8 - LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8 - LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8 - LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 162, 206, 8 - LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 170, 206, 8 - LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1017, 10, 178, 206, 8 - LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1018, 10, 186, 206, 8 - LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 194, 206, 8 - LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 202, 206, 8 - LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 210, 206, 8 - LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8 + LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1014, 10, 154, 206, 8 + LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1015, 10, 162, 206, 8 + LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1016, 10, 170, 206, 8 + LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1017, 10, 178, 206, 8 + LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1018, 10, 186, 206, 8 + LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1019, 10, 194, 206, 8 + LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1020, 10, 202, 206, 8 + LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1021, 10, 210, 206, 8 + LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1022, 10, 218, 206, 8 + LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1023, 10, 226, 206, 8 END diff --git a/puttygen.rc b/puttygen.rc index e1f3feea..95b3c58c 100644 --- a/puttygen.rc +++ b/puttygen.rc @@ -54,40 +54,41 @@ BEGIN END /* No accelerators used */ -214 DIALOG DISCARDABLE 50, 50, 226, 255 +214 DIALOG DISCARDABLE 50, 50, 226, 263 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PuTTY Licence" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 98, 235, 44, 14 + DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14 LTEXT "Copyright \251 1997-2004 Simon Tatham", 1000, 10, 10, 206, 8 LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8 LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8 - LTEXT "Barry, Justin Bradford, Ben Harris, and CORE SDI S.A.", 1003, 10, 42, 206, 8 + LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, and CORE", 1003, 10, 42, 206, 8 + LTEXT "SDI S.A.", 1004, 10, 50, 206, 8 - LTEXT "Permission is hereby granted, free of charge, to any person", 1004, 10, 58, 206, 8 - LTEXT "obtaining a copy of this software and associated documentation", 1005, 10, 66, 206, 8 - LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1006, 10, 74, 206, 8 - LTEXT "including without limitation the rights to use, copy, modify, merge,", 1007, 10, 82, 206, 8 - LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1008, 10, 90, 206, 8 - LTEXT "and to permit persons to whom the Software is furnished to do so,", 1009, 10, 98, 206, 8 - LTEXT "subject to the following conditions:", 1010, 10, 106, 206, 8 + LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8 + LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8 + LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1007, 10, 82, 206, 8 + LTEXT "including without limitation the rights to use, copy, modify, merge,", 1008, 10, 90, 206, 8 + LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1009, 10, 98, 206, 8 + LTEXT "and to permit persons to whom the Software is furnished to do so,", 1010, 10, 106, 206, 8 + LTEXT "subject to the following conditions:", 1011, 10, 114, 206, 8 - LTEXT "The above copyright notice and this permission notice shall be", 1011, 10, 122, 206, 8 - LTEXT "included in all copies or substantial portions of the Software.", 1012, 10, 130, 206, 8 + LTEXT "The above copyright notice and this permission notice shall be", 1012, 10, 130, 206, 8 + LTEXT "included in all copies or substantial portions of the Software.", 1013, 10, 138, 206, 8 - LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8 - LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8 - LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 162, 206, 8 - LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 170, 206, 8 - LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1017, 10, 178, 206, 8 - LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1018, 10, 186, 206, 8 - LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 194, 206, 8 - LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 202, 206, 8 - LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 210, 206, 8 - LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8 + LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1014, 10, 154, 206, 8 + LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1015, 10, 162, 206, 8 + LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1016, 10, 170, 206, 8 + LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1017, 10, 178, 206, 8 + LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1018, 10, 186, 206, 8 + LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1019, 10, 194, 206, 8 + LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1020, 10, 202, 206, 8 + LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1021, 10, 210, 206, 8 + LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1022, 10, 218, 206, 8 + LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1023, 10, 226, 206, 8 END diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c index 7e30adbe..2a2b3ab7 100644 --- a/unix/gtkdlg.c +++ b/unix/gtkdlg.c @@ -2425,7 +2425,7 @@ static void licence_clicked(GtkButton *button, gpointer data) "Portions copyright Robert de Bath, Joris van Rantwijk, Delian " "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas " - "Barry, Justin Bradford, Ben Harris, and CORE SDI S.A.\n\n" + "Barry, Justin Bradford, Ben Harris, Malcolm Smith, and CORE SDI S.A.\n\n" "Permission is hereby granted, free of charge, to any person " "obtaining a copy of this software and associated documentation " diff --git a/win_res.rc b/win_res.rc index 9a16c814..d30672b6 100644 --- a/win_res.rc +++ b/win_res.rc @@ -69,40 +69,41 @@ BEGIN END /* No accelerators used */ -IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 255 +IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 263 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PuTTY Licence" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 98, 235, 44, 14 + DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14 LTEXT "Copyright \251 1997-2004 Simon Tatham", 1000, 10, 10, 206, 8 LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8 LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8 - LTEXT "Barry, Justin Bradford, Ben Harris, and CORE SDI S.A.", 1003, 10, 42, 206, 8 - - LTEXT "Permission is hereby granted, free of charge, to any person", 1004, 10, 58, 206, 8 - LTEXT "obtaining a copy of this software and associated documentation", 1005, 10, 66, 206, 8 - LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1006, 10, 74, 206, 8 - LTEXT "including without limitation the rights to use, copy, modify, merge,", 1007, 10, 82, 206, 8 - LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1008, 10, 90, 206, 8 - LTEXT "and to permit persons to whom the Software is furnished to do so,", 1009, 10, 98, 206, 8 - LTEXT "subject to the following conditions:", 1010, 10, 106, 206, 8 - - LTEXT "The above copyright notice and this permission notice shall be", 1011, 10, 122, 206, 8 - LTEXT "included in all copies or substantial portions of the Software.", 1012, 10, 130, 206, 8 - - LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8 - LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8 - LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1015, 10, 162, 206, 8 - LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1016, 10, 170, 206, 8 - LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1017, 10, 178, 206, 8 - LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1018, 10, 186, 206, 8 - LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1019, 10, 194, 206, 8 - LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1020, 10, 202, 206, 8 - LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1021, 10, 210, 206, 8 - LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8 + LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, and CORE", 1003, 10, 42, 206, 8 + LTEXT "SDI S.A.", 1004, 10, 50, 206, 8 + + LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8 + LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8 + LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1007, 10, 82, 206, 8 + LTEXT "including without limitation the rights to use, copy, modify, merge,", 1008, 10, 90, 206, 8 + LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1009, 10, 98, 206, 8 + LTEXT "and to permit persons to whom the Software is furnished to do so,", 1010, 10, 106, 206, 8 + LTEXT "subject to the following conditions:", 1011, 10, 114, 206, 8 + + LTEXT "The above copyright notice and this permission notice shall be", 1012, 10, 130, 206, 8 + LTEXT "included in all copies or substantial portions of the Software.", 1013, 10, 138, 206, 8 + + LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1014, 10, 154, 206, 8 + LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1015, 10, 162, 206, 8 + LTEXT "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", 1016, 10, 170, 206, 8 + LTEXT "MERCHANTABILITY, FITNESS FOR A PARTICULAR", 1017, 10, 178, 206, 8 + LTEXT "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", 1018, 10, 186, 206, 8 + LTEXT "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES", 1019, 10, 194, 206, 8 + LTEXT "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,", 1020, 10, 202, 206, 8 + LTEXT "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", 1021, 10, 210, 206, 8 + LTEXT "CONNECTION WITH THE SOFTWARE OR THE USE OR", 1022, 10, 218, 206, 8 + LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1023, 10, 226, 206, 8 END -- 2.11.0