1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 03:22:48 -05:00

Merge branch 'pre-0.64'

This commit is contained in:
Jacob Nevins
2015-01-05 23:49:25 +00:00
9 changed files with 13 additions and 13 deletions

View File

@ -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);

View File

@ -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)
{