Add Colin to the licence. (I must remember to add him to the licence

on the website, when we merge this back into the trunk.)

[originally from svn r7158]

diff --git a/LICENCE b/LICENCE
index 1960cc2b0f554aa2689f82e5621f0f12ac64aef8..d14e667a548709b873edc16436d4887f689bfcc9 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -3,7 +3,7 @@ PuTTY is copyright 1997-2007 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, Ahmad Khalifa, Markus
-Kuhn, and CORE SDI S.A.
+Kuhn, Colin Watson, 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 1e3b256148c751b90781bd21a9a9ef16fcfc40a9..6a71a8093487fd67c5289cc4814c55e4bb37a256 100644 (file)
--- a/doc/licence.but
+++ b/doc/licence.but
@@ -6,8 +6,8 @@ PuTTY is \i{copyright} 1997-2007 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, Ahmad Khalifa, Markus Kuhn,
-and CORE SDI S.A.
+Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
+Kuhn, Colin Watson, 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 32d3960fd55a11b49032f8ba8cbb19acf0f21b83..c5ec94e02d5b69ce41230935284a5a2383b9227a 100644 (file)
--- a/mac/mac_res.r
+++ b/mac/mac_res.r
@@ -1247,7 +1247,7 @@ resource 'TEXT' (wLicence, "licence", purgeable) {
     "Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
     "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, "
     "Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus "
-    "Kuhn, and CORE SDI S.A.\n"
+    "Kuhn, Colin Watson, 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 5dafc6de811539537e8b8bf94445dd9e3311c474..8f85b29f94421330e50b4fd1904c72bbfcd5b3c5 100644 (file)
--- a/mac/macpgen.r
+++ b/mac/macpgen.r
@@ -448,7 +448,7 @@ resource 'TEXT' (wLicence, "licence", purgeable) {
     "Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
     "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, "
     "Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus "
-    "Kuhn, and CORE SDI S.A.\n"
+    "Kuhn, Colin Watson, 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 ae8dad4805f2f1c5009e08464e83628eefe82b05..b34fcedcabb45de1fc8426766eda5c9cefe86b1d 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -2661,7 +2661,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, Malcolm Smith, Ahmad Khalifa, "
-       "Markus Kuhn, and CORE SDI S.A.\n\n"
+       "Markus Kuhn, Colin Watson, 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 c2b5b7cd824ea92ea38b5915bf2b9e00e3d1c481..ea143a5ba34a5a2b72c19b4af2d888cbc6202ca6 100644 (file)
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@ -62,7 +62,7 @@ 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, Ahmad Khalifa,", 1003, 10, 42, 206, 8
-    LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
+    LTEXT "Markus Kuhn, Colin Watson, 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 df755feee08ad62305f7f46192be26e37512bedb..ffdb136dc34272f487e4adb890a64d08556763a8 100644 (file)
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@ -55,7 +55,7 @@ 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, Ahmad Khalifa,", 1003, 10, 42, 206, 8
-    LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
+    LTEXT "Markus Kuhn, Colin Watson, 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.rc2 b/windows/win_res.rc2
index be9b95e7f66d50bf8eb6313f6ff910c7e5e99084..63951abcc6eb8c1646297a5207999dc6b58751dc 100644 (file)
--- a/windows/win_res.rc2
+++ b/windows/win_res.rc2
@@ -63,7 +63,7 @@ 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, Ahmad Khalifa,", 1003, 10, 42, 206, 8
-    LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
+    LTEXT "Markus Kuhn, Colin Watson, 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