asedeno.scripts.mit.edu Git - PuTTY.git/commit

]> asedeno.scripts.mit.edu Git - PuTTY.git/commit

author	Simon Tatham <anakin@pobox.com>
	Wed, 4 Jun 2008 23:05:48 +0000 (23:05 +0000)
committer	Simon Tatham <anakin@pobox.com>
	Wed, 4 Jun 2008 23:05:48 +0000 (23:05 +0000)
commit	865b6b404d34f8eec5d3a3abccb8e38271bef6a6
tree	f2e726ed5d43714bfd966f5cb657ae39a68aa1b9	tree \| snapshot
parent	e81a8cf795825bc133678d33c4e2ca4585edf811	commit \| diff
parent	ae5002075a4762eb53f7b1a1c4fbe49ec3cf99aa	commit \| diff

At last, merge the putty-gtk2 branch back into the trunk!

[originally from svn r8037]

local copy of git://git.tartarus.org/simon/putty.git