aboutsummaryrefslogtreecommitdiffstats
path: root/mps/code/format.c
diff options
context:
space:
mode:
authorRichard Brooksby2001-12-05 15:48:24 +0000
committerRichard Brooksby2001-12-05 15:48:24 +0000
commit492dd3c684e53bd42b28371bdaaa99ad67ebd835 (patch)
tree59a2df0f685b93b44fbc03847b76782275308aaf /mps/code/format.c
parent25c78993edd7b4a607eba951b6ab2a9a51c55b62 (diff)
downloademacs-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/format.c')
-rw-r--r--mps/code/format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mps/code/format.c b/mps/code/format.c
index c5403e15c5e..73a3d722806 100644
--- a/mps/code/format.c
+++ b/mps/code/format.c
@@ -1,6 +1,6 @@
1/* impl.c.format: OBJECT FORMATS 1/* impl.c.format: OBJECT FORMATS
2 * 2 *
3 * $HopeName: MMsrc!format.c(trunk.20) $ 3 * $HopeName: MMsrc!format.c(trunk.21) $
4 * Copyright (C) 2000 Harlequin Limited. All rights reserved. 4 * Copyright (C) 2000 Harlequin Limited. All rights reserved.
5 * 5 *
6 * DESIGN 6 * DESIGN
@@ -10,7 +10,7 @@
10 10
11#include "mpm.h" 11#include "mpm.h"
12 12
13SRCID(format, "$HopeName: MMsrc!format.c(trunk.20) $"); 13SRCID(format, "$HopeName: MMsrc!format.c(trunk.21) $");
14 14
15 15
16/* FormatCheck -- check a format */ 16/* FormatCheck -- check a format */