From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 27 Oct 1999 14:06:44 +0000 (+0000)
Subject: Integrate with Sarathy; manual resolve on regcomp.c conflicts
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1ae6be1c7649fa55b3105031a58ffe146fa4f2fd;p=p5sagit%2Fp5-mst-13.2.git

Integrate with Sarathy; manual resolve on regcomp.c conflicts
(Ilya's changes won).

p4raw-id: //depot/cfgperl@4468
---

1ae6be1c7649fa55b3105031a58ffe146fa4f2fd
diff --cc perlapi.c
index 99a549b,41dd32a..41dd32a
mode 100755,100644..100755
--- a/perlapi.c
+++ b/perlapi.c