From 492dd3c684e53bd42b28371bdaaa99ad67ebd835 Mon Sep 17 00:00:00 2001
From: Richard Brooksby
Date: Wed, 5 Dec 2001 15:48:24 +0000
Subject: Merging changes from union to masters.  this incorporates pekka's
 updates: tuning and a type in amcsshe.c and some adding some missing checks
 in arenavm.c.  it also brings our cope of their hopenames up to date.

Copied from Perforce
 Change: 24815
 ServerID: perforce.ravenbrook.com

---
 mps/code/protocol.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mps/code/protocol.c')

diff --git a/mps/code/protocol.c b/mps/code/protocol.c
index 8faec02f188..c2f32b66073 100644
--- a/mps/code/protocol.c
+++ b/mps/code/protocol.c
@@ -1,6 +1,6 @@
 /* impl.c.pool: PROTOCOL IMPLEMENTATION
  *
- * $HopeName: MMsrc!protocol.c(trunk.2) $
+ * $HopeName: MMsrc!protocol.c(trunk.3) $
  * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
  *
  * DESIGN
@@ -11,7 +11,7 @@
 #include "mpm.h"
 
 
-SRCID(protocol, "$HopeName: MMsrc!protocol.c(trunk.2) $");
+SRCID(protocol, "$HopeName: MMsrc!protocol.c(trunk.3) $");
 
 
 /* ProtocolClassCheck -- check a protocol class */
-- 
cgit v1.2.1