diff options
| author | Richard Brooksby | 2001-12-05 15:48:24 +0000 |
|---|---|---|
| committer | Richard Brooksby | 2001-12-05 15:48:24 +0000 |
| commit | 492dd3c684e53bd42b28371bdaaa99ad67ebd835 (patch) | |
| tree | 59a2df0f685b93b44fbc03847b76782275308aaf /mps/code/protocol.h | |
| parent | 25c78993edd7b4a607eba951b6ab2a9a51c55b62 (diff) | |
| download | emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.tar.gz emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.zip | |
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
Diffstat (limited to 'mps/code/protocol.h')
| -rw-r--r-- | mps/code/protocol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mps/code/protocol.h b/mps/code/protocol.h index f2c7e4134fb..7acdf1c397f 100644 --- a/mps/code/protocol.h +++ b/mps/code/protocol.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* impl.h.protocol: PROTOCOL INHERITANCE DEFINITIONS | 1 | /* impl.h.protocol: PROTOCOL INHERITANCE DEFINITIONS |
| 2 | * | 2 | * |
| 3 | * $HopeName: MMsrc!protocol.h(trunk.4) $ | 3 | * $HopeName: MMsrc!protocol.h(trunk.5) $ |
| 4 | * Copyright (C) 1999 Harlequin Limited. All rights reserved. | 4 | * Copyright (C) 1999 Harlequin Limited. All rights reserved. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||