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

diff --git a/LICENCE b/LICENCE
index 2f20341..ca8baad 100644 (file)
--- 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,
 
 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
 
 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 ac7fcf0..7319ae2 100644 (file)
--- 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,
 
 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
 
 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 fd688d3..39f6835 100644 (file)
--- 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"
 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 "
     "\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 82a25ff..5a6ed60 100644 (file)
--- 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"
 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 "
     "\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 97af792..b202d90 100644 (file)
--- 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 "
 
        "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 "
 
        "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 3967ee5..29da821 100644 (file)
--- 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 "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
 
     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 417f83d..261dbcb 100644 (file)
--- 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 "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
 
     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 d89868d..e34683b 100644 (file)
--- 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 "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
 
     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