Merge branch 'pre-0.64'

[PuTTY.git] / doc / licence.but

diff --git a/doc/licence.but b/doc/licence.but
index 1e3b256148c751b90781bd21a9a9ef16fcfc40a9..333a9192db90f9738d96652c55cca0e41eaa7a10 100644 (file)
--- a/doc/licence.but
+++ b/doc/licence.but
@@ -1,13 +1,11 @@
-\define{versionidlicence} \versionid $Id$
-

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

-PuTTY is \i{copyright} 1997-2007 Simon Tatham.
+PuTTY is \i{copyright} 1997-2015 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, Ahmad Khalifa, 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