Resolve mainline before possible hacking operertunity this weekend
Nick Ing-Simmons [Sat, 23 Oct 1999 00:46:22 +0000 (00:46 +0000)]
p4raw-id: //depot/utfperl@4424

1  2 
objXSUB.h
perl.h

diff --cc objXSUB.h
Simple merge
diff --cc perl.h
Simple merge