From 35309b56834a81eb1a47ad96605b663237a31f0e Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 25 Jan 2007 19:36:11 +0000 Subject: [PATCH] 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] --- LICENCE | 2 +- doc/licence.but | 4 ++-- mac/mac_res.r | 2 +- mac/macpgen.r | 2 +- unix/gtkdlg.c | 2 +- windows/pageant.rc | 2 +- windows/puttygen.rc | 2 +- windows/win_res.rc2 | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/LICENCE b/LICENCE index 1960cc2b..d14e667a 100644 --- 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 1e3b2561..6a71a809 100644 --- 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 32d3960f..c5ec94e0 100644 --- 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 5dafc6de..8f85b29f 100644 --- 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 ae8dad48..b34fcedc 100644 --- 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 c2b5b7cd..ea143a5b 100644 --- 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 df755fee..ffdb136d 100644 --- 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 be9b95e7..63951abc 100644 --- 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 -- 2.45.2