simon-git: putty (master): Owen Dunn

[Commits to Tartarus CVS repository.]

TL;DR:
  d8fdb49 Merge branch 'master' of ssh://tartarus.org/putty
  0f5299e Move sfree inside if.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Owen Dunn <owen at greenend.org.uk>
Date:           2015-11-27 19:54:40

commit d8fdb494515c17b4a529f99a81d20214687bf6a3
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d8fdb494515c17b4a529f99a81d20214687bf6a3;hp=6c9aa9be32a44d1b2ffd02d211e6e76ec328ee76
Merge: 6c9aa9b 21a37d2
Author: Owen Dunn <owen at greenend.org.uk>
Date:   Fri Nov 27 19:44:25 2015 +0000

    Merge branch 'master' of ssh://tartarus.org/putty

commit 0f5299e5a86e87068277b19c008ff5eb0f78d022
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=0f5299e5a86e87068277b19c008ff5eb0f78d022;hp=d8fdb494515c17b4a529f99a81d20214687bf6a3
Author: Owen Dunn <owen at greenend.org.uk>
Date:   Fri Nov 27 19:52:46 2015 +0000

    Move sfree inside if.

 windows/window.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)