Merge reconfig fixes from branch 'pre-0.64'.

[PuTTY.git] / doc / licence.but

diff --git a/doc/licence.but b/doc/licence.but
index 91d703c88c119b0c1a0210c9e23b7b40b1cd75d7..68cba42029a596d65fc4aad966bcb91626943ae9 100644 (file)
--- a/doc/licence.but
+++ b/doc/licence.but
@@ -1,12 +1,11 @@
-\define{versionidlicence} \versionid $Id$
-

 \A{licence} PuTTY \ii{Licence}
 
 \A{licence} PuTTY \ii{Licence}
 

-PuTTY is \i{copyright} 1997-2005 Simon Tatham.
+PuTTY is \i{copyright} 1997-2014 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, Markus Kuhn, and CORE SDI S.A.
+Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
+Kuhn, Colin Watson, Christopher Staite, 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