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/xcppgc.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mps/code/xcppgc.gmk') diff --git a/mps/code/xcppgc.gmk b/mps/code/xcppgc.gmk index 6c2cd7e64a8..f01408ed130 100644 --- a/mps/code/xcppgc.gmk +++ b/mps/code/xcppgc.gmk @@ -1,6 +1,6 @@ # impl.gmk.xcppgc: BUILD FOR MACOS X (CARBON)/POWERPC/GCC PLATFORM # -# $HopeName: MMsrc!xcppgc.gmk(MM_epcore_brisling.1) $ +# $HopeName: MMsrc!xcppgc.gmk(trunk.2) $ # Copyright (C) 2001 Harlequin Limited. All rights reserved. PFM = xcppgc -- cgit v1.2.1