From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Mon, 5 Jan 2015 23:49:25 +0000 (+0000)
Subject: Merge branch 'pre-0.64'
X-Git-Tag: 0.68~636
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5904545cc18289541702da284b00490cb25a753e;p=PuTTY.git

Merge branch 'pre-0.64'
---

5904545cc18289541702da284b00490cb25a753e
diff --cc windows/pageant.rc
index d354a9c7,20ec509b..dee8a12e
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@@ -55,9 -55,9 +55,9 @@@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAP
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    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 --cc windows/puttygen.rc
index 63c0bcc0,9547e754..8982674a
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@@ -48,9 -48,9 +48,9 @@@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAP
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    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 --cc windows/win_res.rc2
index d0273350,b7dfd945..744780ba
--- a/windows/win_res.rc2
+++ b/windows/win_res.rc2
@@@ -56,9 -56,9 +56,9 @@@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAP
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    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