Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitattributes
	.gitignore
	README.md
	Recipe
	adb.c
	cmdline.c
	config.c
	dialog.c
	dialog.h
	import.c
	misc.c
	mkfiles.pl
	putty.h
	putty.sln
	settings.c
	unix/.gitignore
	unix/urlhack_unix.c
	urlhack.c
	windows/MSVC2010/putty/putty.vcxproj
	windows/build-debug.bat
	windows/build-release.bat
	windows/cygcfg.c
	windows/cygterm.c
	windows/pageant.rc
	windows/pickicondialog.c
	windows/pickicondialog.h
	windows/puttygen.rc
	windows/urlhack.h
	windows/urlhack_win.c
	windows/wincfg.c
	windows/winctrls.c
	windows/windlg.c
	windows/window.c
	windows/winmisc.c
	windows/winnoise.c
	windows/winpgen.c
	windows/winpgnt.c
	windows/winstore.c
	windows/winstuff.h

Author: artifexor

.gitattributes

@@ -1,2 +1,6 @@
 *.vcxproj  eol=crlf
 *.sln      eol=crlf
+<<<<<<< HEAD
+=======
+*.bat      eol=crlf
+>>>>>>> upstream/master

.gitignore

@@ -10,6 +10,11 @@ charset/sbcsdat.c
 *.pdb
 /empty.h
 *.o
+<<<<<<< HEAD
+=======
+*.swp
+*~
+>>>>>>> upstream/master
 unix/plink
 unix/pscp
 unix/psftp
@@ -18,6 +23,10 @@ unix/pterm
 unix/putty
 unix/puttytel
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> upstream/master
 # github's gitignore for Visual Studio: a6dd83c18d0beb8e36c091fd33b64ca45a3a0f3a 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
@@ -167,3 +176,7 @@ $RECYCLE.BIN/
 
 # Mac crap
 .DS_Store
+<<<<<<< HEAD
+=======
+unix/libversion.a
+>>>>>>> upstream/master

.lvimrc

@@ -0,0 +1 @@
+set tabstop=8 softtabstop=4 shiftwidth=4 expandtab

Buildscr.cv

@@ -0,0 +1,39 @@
+# -*- sh -*-
+
+# Build script to scan PuTTY with the downloadable Coverity scanner
+# and generate a tar file to upload to their open-source scanning
+# service.
+
+module putty
+
+# Preparations.
+in putty do ./mkfiles.pl
+in putty do ./mkauto.sh
+in putty/doc do make
+
+# Scan the Unix build, on a 64-bit system to differentiate as much as
+# possible from the other scan of the cross-platform files.
+delegate covscan64
+  in putty do ./configure
+  in putty do cov-build --dir cov-int make
+  in putty do tar czvf cov-int.tar.gz cov-int
+  return putty/cov-int.tar.gz
+enddelegate
+
+# Scan the Windows build, by means of building with Winelib (since as
+# of 2013-07-22, the Coverity Scan website doesn't offer a 32-bit
+# Windows scanner for download).
+delegate covscan32wine
+  in putty do tar xzvf cov-int.tar.gz
+  in putty/windows do cov-build --dir ../cov-int make -f Makefile.cyg CC=winegcc RC=wrc
+  in putty do tar czvf cov-int.tar.gz cov-int
+  return putty/cov-int.tar.gz
+enddelegate
+
+# Provide the revision number as one of the build outputs, to make it
+# easy to construct a curl upload command which will annotate it
+# appropriately when uploaded.
+in putty do echo $(revision) > revision.txt
+
+deliver putty/revision.txt $@
+deliver putty/cov-int.tar.gz $@

LATEST.VER

@@ -1 +1 @@
-0.62
+0.63

LICENCE

@@ -1,4 +1,4 @@
-PuTTY is copyright 1997-2012 Simon Tatham.
+PuTTY is copyright 1997-2013 Simon Tatham.
 
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,

README.md

@@ -26,7 +26,11 @@ Visual Studio 2010 project files are included.  These should **just work**, ther
 
 The original build system for PuTTY is intact, i.e. you can run `perl mkfiles.pl` and it will regenerate all the other build systems, including VS6 and various flavours of makefiles.
 
+<<<<<<< HEAD
 My released builds are still done with VS2010's nmake (using `windows/build-release.bat`, and will continue to be done so until XP drops out of support.
+=======
+My released builds are still done with VS2010's `nmake` (using `windows/build-release.bat`), and will continue to be done so until XP drops out of support.
+>>>>>>> upstream/master
 
 ## License
 

Recipe

@@ -338,8 +338,8 @@ W_BE_ALL = be_all_s winser cproxy
 W_BE_NOSSH = be_nos_s winser nocproxy
            + cygterm
 # And with the Unix serial-port module.
-U_BE_ALL = be_all_s uxser cproxy
-U_BE_NOSSH = be_nos_s uxser nocproxy
+U_BE_ALL = be_all_u uxser cproxy
+U_BE_NOSSH = be_nos_u uxser nocproxy
 
 # ------------------------------------------------------------
 # Definitions of actual programs. The program name, followed by a
@@ -348,13 +348,20 @@ U_BE_NOSSH = be_nos_s uxser nocproxy
 # X/GTK Unix app, [U] for command-line Unix app.
 
 putty    : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC winx11 putty.res urlhack regexp LIBS
+<<<<<<< HEAD
 puttytel : [G] GUITERM NONSSH W_BE_NOSSH WINMISC puttytel.res nogss urlhack regexp LIBS
+=======
+         + fatty
+         + winpgen sshrsag sshdssg sshprime import
+         + winpgnt
+>>>>>>> upstream/master
 plink    : [C] winplink wincons NONSSH WINSSH W_BE_ALL logging WINMISC
          + winx11 plink.res winnojmp LIBS
 pscp     : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
          + pscp.res winnojmp LIBS
 psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
          + psftp.res winnojmp LIBS
+<<<<<<< HEAD
 
 pageant  : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234
          + misc sshaes sshsha winpgntc sshdss sshsh256 sshsh512 winutils
@@ -366,6 +373,8 @@ puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
 	 + tree234 notiming winhelp winnojmp conf LIBS wintime
          + pickicondialog
 
+=======
+>>>>>>> upstream/master
 pterm    : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore
          + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg
 	 + nogss