From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Wed, 12 Nov 1997 01:54:23 +0000 (+0000)
Subject: Integrate mainline after it integrated us.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b895db692edda991298fa3a7f36edb9c757894ee;p=p5sagit%2Fp5-mst-13.2.git

Integrate mainline after it integrated us.
Accepted 'theirs' everywhere - so two branches should
now point to same files again.
Almost all of these were what was suggested, others were
whitespace diffs. A few dubious spots which we will now
go fix.

p4raw-id: //depot/ansiperl@236
---

b895db692edda991298fa3a7f36edb9c757894ee