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

[originally from svn r8037]

diff --cc charset/macenc.c
index 4aa02d1b7e009dd2b85600d84b708a9eec6582e6,4aa02d1b7e009dd2b85600d84b708a9eec6582e6..428e3dca0f9d0828452eeccba1e751816c258f1a
--- 1/charset/macenc.c
--- 2/charset/macenc.c
+++ b/charset/macenc.c
@@@ -1,4 -1,4 +1,4 @@@
--/* $Id: macenc.c,v 1.2 2003/01/25 19:21:56 ben Exp $ */
++/* $Id$ */
  /*
   * Copyright (c) 2003 Ben Harris
   * All rights reserved.

diff --cc mac/macabout.c
index 3b7732d4e7c1e17bf279f9774de802ca6265646b,3b7732d4e7c1e17bf279f9774de802ca6265646b..4711b06adc6d463c05e486fc56141cec6d17af3e
--- 1/mac/macabout.c
--- 2/mac/macabout.c
+++ b/mac/macabout.c
@@@ -1,4 -1,4 +1,4 @@@
--/* $Id: macabout.c,v 1.3 2003/03/29 23:07:55 ben Exp $ */
++/* $Id$ */
  /*
   * Copyright (c) 1999, 2002, 2003 Ben Harris
   * All rights reserved.

diff --cc mac/macpgen.c
index 486a4e93133f4a475e942c40bb571f0964020ea0,486a4e93133f4a475e942c40bb571f0964020ea0..f8765c432fec3da352bac8216ce023e3352240bc
--- 1/mac/macpgen.c
--- 2/mac/macpgen.c
+++ b/mac/macpgen.c
@@@ -1,4 -1,4 +1,4 @@@
--/* $Id: macpgen.c,v 1.5 2003/02/23 13:31:12 ben Exp $ */
++/* $Id$ */
  /*
   * Copyright (c) 1999, 2003 Ben Harris
   * All rights reserved.

diff --cc mac/macpgkey.c
index a81695fd15ad9224ed92ff872aca1960868b6a1b,a81695fd15ad9224ed92ff872aca1960868b6a1b..f78f338d8a804bd5dec631df55fe6f5ddf8058a5
--- 1/mac/macpgkey.c
--- 2/mac/macpgkey.c
+++ b/mac/macpgkey.c
@@@ -1,4 -1,4 +1,4 @@@
--/* $Id: macpgkey.c,v 1.5 2003/03/29 23:57:55 ben Exp $ */
++/* $Id$ */
  /*
   * Copyright (c) 2003 Ben Harris
   * Copyright (c) 1997-2003 Simon Tatham

diff --cc mac/macpgrid.h
index 438f3cb214faeef2500468b3b276bc4c6bee47e9,438f3cb214faeef2500468b3b276bc4c6bee47e9..7f8439547d448919a692950fff6848f7046d38c0
--- 1/mac/macpgrid.h
--- 2/mac/macpgrid.h
+++ b/mac/macpgrid.h
@@@ -1,4 -1,4 +1,4 @@@
--/* $Id: macpgrid.h,v 1.4 2003/02/20 22:55:09 ben Exp $ */
++/* $Id$ */
  
  /*
   * macpgrid.h -- Mac resource IDs for PuTTYgen