From 1c470c1389113262b90e172811fa4012284dad37 Mon Sep 17 00:00:00 2001 From: jacob Date: Wed, 23 Mar 2005 20:23:07 +0000 Subject: [PATCH] Since Markus Kuhn no longer explicitly places wcwidth.c in the public domain, it'd probably be generous to list him in the copyrights. git-svn-id: svn://svn.tartarus.org/sgt/putty@5548 cda61777-01e9-0310-a592-d414129be87e --- LICENCE | 3 ++- doc/licence.but | 2 +- mac/mac_res.r | 7 ++++--- mac/macpgen.r | 7 ++++--- unix/gtkdlg.c | 3 ++- windows/pageant.rc | 4 ++-- windows/puttygen.rc | 4 ++-- windows/win_res.rc | 4 ++-- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/LICENCE b/LICENCE index 2f203412..ca8baad2 100644 --- a/LICENCE +++ b/LICENCE @@ -2,7 +2,8 @@ PuTTY is copyright 1997-2005 Simon Tatham. Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, -Justin Bradford, Ben Harris, Malcolm Smith, and CORE SDI S.A. +Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, 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 ac7fcf06..7319ae29 100644 --- a/doc/licence.but +++ b/doc/licence.but @@ -6,7 +6,7 @@ PuTTY is copyright 1997-2005 Simon Tatham. Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, -Justin Bradford, Ben Harris, Malcolm Smith, and CORE SDI S.A. +Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, 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 fd688d3e..39f68350 100644 --- a/mac/mac_res.r +++ b/mac/mac_res.r @@ -1244,9 +1244,10 @@ type 'TEXT' { resource 'TEXT' (wLicence, "licence", purgeable) { "PuTTY is copyright 1997-2005 Simon Tatham.\n" "\n" - "Portions copyright Robert de Bath, Joris van Rantwijk, Delian" - "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry," - "Justin Bradford, Ben Harris, Malcolm Smith, and CORE SDI S.A.\n" + "Portions copyright Robert de Bath, Joris van Rantwijk, Delian " + "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, " + "Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, 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/mac/macpgen.r b/mac/macpgen.r index 82a25ffb..5a6ed606 100644 --- a/mac/macpgen.r +++ b/mac/macpgen.r @@ -445,9 +445,10 @@ type 'TEXT' { resource 'TEXT' (wLicence, "licence", purgeable) { "Copyright 1997-2005 Simon Tatham.\n" "\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" + "Portions copyright Robert de Bath, Joris van Rantwijk, Delian " + "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, " + "Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, 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/unix/gtkdlg.c b/unix/gtkdlg.c index 97af792e..b202d904 100644 --- a/unix/gtkdlg.c +++ b/unix/gtkdlg.c @@ -2428,7 +2428,8 @@ 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, Malcolm Smith, and CORE SDI S.A.\n\n" + "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, " + "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/windows/pageant.rc b/windows/pageant.rc index 3967ee5d..29da8214 100644 --- a/windows/pageant.rc +++ b/windows/pageant.rc @@ -58,8 +58,8 @@ BEGIN 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, Malcolm Smith, and CORE", 1003, 10, 42, 206, 8 - LTEXT "SDI S.A.", 1004, 10, 50, 206, 8 + LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn,", 1003, 10, 42, 206, 8 + LTEXT "and CORE 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 diff --git a/windows/puttygen.rc b/windows/puttygen.rc index 417f83d0..261dbcb5 100644 --- a/windows/puttygen.rc +++ b/windows/puttygen.rc @@ -51,8 +51,8 @@ BEGIN 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, Malcolm Smith, and CORE", 1003, 10, 42, 206, 8 - LTEXT "SDI S.A.", 1004, 10, 50, 206, 8 + LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn,", 1003, 10, 42, 206, 8 + LTEXT "and CORE 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 diff --git a/windows/win_res.rc b/windows/win_res.rc index d89868d6..e34683bb 100644 --- a/windows/win_res.rc +++ b/windows/win_res.rc @@ -56,8 +56,8 @@ BEGIN 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, Malcolm Smith, and CORE", 1003, 10, 42, 206, 8 - LTEXT "SDI S.A.", 1004, 10, 50, 206, 8 + LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn,", 1003, 10, 42, 206, 8 + LTEXT "and CORE 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 -- 2.11.0