Integrate with Sarathy.
Jarkko Hietaniemi [Tue, 4 Jul 2000 04:50:07 +0000 (04:50 +0000)]
p4raw-id: //depot/cfgperl@6301

14 files changed:
1  2 
embed.h
embed.pl
embedvar.h
intrpvar.h
makedef.pl
objXSUB.h
perl.c
perl.h
perlapi.c
perlapi.h
pp_hot.c
proto.h
sv.c
win32/win32.c

diff --cc embed.h
Simple merge
diff --cc embed.pl
Simple merge
diff --cc embedvar.h
Simple merge
diff --cc intrpvar.h
Simple merge
diff --cc makedef.pl
Simple merge
diff --cc objXSUB.h
Simple merge
diff --cc perl.c
Simple merge
diff --cc perl.h
Simple merge
diff --cc perlapi.c
index 51323c0,6a2b5b0..470a8ec
mode 100755,100644..100755
+++ b/perlapi.c
diff --cc perlapi.h
index 7d09904,de0e7cc..4a95fbb
mode 100755,100644..100755
+++ b/perlapi.h
diff --cc pp_hot.c
Simple merge
diff --cc proto.h
Simple merge
diff --cc sv.c
Simple merge
diff --cc win32/win32.c
Simple merge