Merge branch 'pre-0.64'

diff --git a/LICENCE b/LICENCE
index 2d3a374dd5987ce89570cc72fd5d4c32de05aa52..3e15aeb9bbba2c257db6fda685fd3b4e83cf755f 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-PuTTY is copyright 1997-2014 Simon Tatham.
+PuTTY is copyright 1997-2015 Simon Tatham.
 
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,

diff --git a/doc/blurb.but b/doc/blurb.but
index eee74c09096b6808a645c7bd347a0ddafc7728ce..d04c4ddb5d9d10d14fe3869e234b1bce2be18677 100644 (file)
--- a/doc/blurb.but
+++ b/doc/blurb.but
@@ -31,6 +31,6 @@ features not described here; and the \i\cw{pterm} and command-line
 Unix-specific documentation that currently exists is the
 \I{man pages for PuTTY tools}man pages.
 
-\copyright This manual is copyright 2001-2014 Simon Tatham. All
+\copyright This manual is copyright 2001-2015 Simon Tatham. All
 rights reserved. You may distribute this documentation under the MIT
 licence. See \k{licence} for the licence text in full.

diff --git a/doc/licence.but b/doc/licence.but
index 68cba42029a596d65fc4aad966bcb91626943ae9..333a9192db90f9738d96652c55cca0e41eaa7a10 100644 (file)
--- a/doc/licence.but
+++ b/doc/licence.but
@@ -1,6 +1,6 @@
 \A{licence} PuTTY \ii{Licence}
 
-PuTTY is \i{copyright} 1997-2014 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,

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index ffdf3236b2e10e5c4e0496e4f206961294e6b0d3..9fd28ce7e8bd8055c940627f2d9b629e0f483c83 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3439,7 +3439,7 @@ static void licence_clicked(GtkButton *button, gpointer data)
     char *title;
 
     char *licence =
-       "Copyright 1997-2014 Simon Tatham.\n\n"
+       "Copyright 1997-2015 Simon Tatham.\n\n"
 
        "Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
        "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas "
@@ -3520,7 +3520,7 @@ void about_box(void *window)
                       w, FALSE, FALSE, 5);
     gtk_widget_show(w);
 
-    w = gtk_label_new("Copyright 1997-2014 Simon Tatham. All rights reserved");
+    w = gtk_label_new("Copyright 1997-2015 Simon Tatham. All rights reserved");
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox),
                       w, FALSE, FALSE, 5);
     gtk_widget_show(w);

diff --git a/unix/uxplink.c b/unix/uxplink.c
index d4230935edfcfe1bf059c245dbf1e23f0ebaa8e9..4f991ba88551252e51c2f0067d98ecfcf43c933e 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -113,7 +113,7 @@ static void *backhandle;
 static Conf *conf;
 
 /*
- * Default settings that are specific to pterm.
+ * Default settings that are specific to Unix plink.
  */
 char *platform_default_s(const char *name)
 {

diff --git a/windows/pageant.rc b/windows/pageant.rc
index d354a9c751603a14c3ff2480473f4b6dcf2e34e7..dee8a12e28cafd52c3a35a2885fc8f76461a9788 100644 (file)
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@ -45,7 +45,7 @@ BEGIN
     PUSHBUTTON "View &Licence", 101, 6, 52, 70, 14
     CTEXT "Pageant", 102, 10, 6, 120, 8
     CTEXT "", 100, 10, 16, 120, 16
-    CTEXT "\251 1997-2014 Simon Tatham. All rights reserved.",
+    CTEXT "\251 1997-2015 Simon Tatham. All rights reserved.",
           103, 10, 34, 120, 16
 END
 
@@ -57,7 +57,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
 
-    LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+    LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 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

diff --git a/windows/puttygen.rc b/windows/puttygen.rc
index 63c0bcc076d9b3b4cc67165113c834864c9a7073..8982674a9ab3a506e331ac895312abe266dc82d5 100644 (file)
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@ -38,7 +38,7 @@ BEGIN
     PUSHBUTTON "View &Licence", 101, 6, 52, 70, 14
     CTEXT "PuTTYgen", 102, 10, 6, 120, 8
     CTEXT "", 100, 10, 16, 120, 16
-    CTEXT "\251 1997-2014 Simon Tatham. All rights reserved.",
+    CTEXT "\251 1997-2015 Simon Tatham. All rights reserved.",
           103, 10, 34, 120, 16
 END
 
@@ -50,7 +50,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
 
-    LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+    LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 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

diff --git a/windows/version.rc2 b/windows/version.rc2
index 5a30c1a38df00bf5320f857453e3fb337a55fada..f3c002df59d912145d35e3ca689839ef54a7a434 100644 (file)
--- a/windows/version.rc2
+++ b/windows/version.rc2
@@ -44,7 +44,7 @@ BEGIN
            VALUE "OriginalFilename",   APPNAME
            VALUE "FileVersion",        TEXTVER
            VALUE "ProductVersion",     TEXTVER
-           VALUE "LegalCopyright",     "Copyright \251 1997-2014 Simon Tatham."
+           VALUE "LegalCopyright",     "Copyright \251 1997-2015 Simon Tatham."
 #if (!defined SNAPSHOT) && (!defined RELEASE) && (!defined PRERELEASE)
            /* Only if VS_FF_PRIVATEBUILD. */
            VALUE "PrivateBuild",       TEXTVER /* NBI */

diff --git a/windows/win_res.rc2 b/windows/win_res.rc2
index d0273350a4604ff43489091cded39bbcd6b6c02c..744780ba67d8a14723e7a82bee3e7e04211dcf84 100644 (file)
--- a/windows/win_res.rc2
+++ b/windows/win_res.rc2
@@ -26,7 +26,7 @@ BEGIN
     PUSHBUTTON "Visit &Web Site", IDA_WEB, 84, 52, 70, 14
     CTEXT "PuTTY", IDA_TEXT1, 10, 6, 194, 8
     CTEXT "", IDA_VERSION, 10, 16, 194, 16
-    CTEXT "\251 1997-2014 Simon Tatham. All rights reserved.",
+    CTEXT "\251 1997-2015 Simon Tatham. All rights reserved.",
           IDA_TEXT2, 10, 34, 194, 16
 END
 
@@ -58,7 +58,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
 
-    LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+    LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 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