Integrate with Sarathy; manual resolve on regcomp.c conflicts
Jarkko Hietaniemi [Wed, 27 Oct 1999 14:06:44 +0000 (14:06 +0000)]
(Ilya's changes won).

p4raw-id: //depot/cfgperl@4468

14 files changed:
1  2 
deb.c
dump.c
embed.pl
mg.c
op.c
perl.c
perl.h
perlapi.c
pod/perldelta.pod
pod/perldiag.pod
pp.c
proto.h
regcomp.c
sv.c

diff --cc deb.c
Simple merge
diff --cc dump.c
Simple merge
diff --cc embed.pl
Simple merge
diff --cc mg.c
Simple merge
diff --cc op.c
Simple merge
diff --cc perl.c
Simple merge
diff --cc perl.h
Simple merge
diff --cc perlapi.c
index 99a549b,41dd32a..41dd32a
mode 100755,100644..100755
+++ b/perlapi.c
Simple merge
Simple merge
diff --cc pp.c
Simple merge
diff --cc proto.h
Simple merge
diff --cc regcomp.c
Simple merge
diff --cc sv.c
Simple merge