From: Simon Tatham <anakin@pobox.com>
Date: Wed, 4 Jun 2008 23:05:48 +0000 (+0000)
Subject: At last, merge the putty-gtk2 branch back into the trunk!
X-Git-Tag: 0.61~249
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=865b6b404d34f8eec5d3a3abccb8e38271bef6a6;hp=ae5002075a4762eb53f7b1a1c4fbe49ec3cf99aa;p=PuTTY.git

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

[originally from svn r8037]
---

diff --git a/charset/macenc.c b/charset/macenc.c
index 4aa02d1b..428e3dca 100644
--- a/charset/macenc.c
+++ b/charset/macenc.c
@@ -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 --git a/mac/macabout.c b/mac/macabout.c
index 3b7732d4..4711b06a 100644
--- a/mac/macabout.c
+++ b/mac/macabout.c
@@ -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 --git a/mac/macpgen.c b/mac/macpgen.c
index 486a4e93..f8765c43 100644
--- a/mac/macpgen.c
+++ b/mac/macpgen.c
@@ -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 --git a/mac/macpgkey.c b/mac/macpgkey.c
index a81695fd..f78f338d 100644
--- a/mac/macpgkey.c
+++ b/mac/macpgkey.c
@@ -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 --git a/mac/macpgrid.h b/mac/macpgrid.h
index 438f3cb2..7f843954 100644
--- a/mac/macpgrid.h
+++ b/mac/macpgrid.h
@@ -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