Resolve against mainline
Nick Ing-Simmons [Thu, 18 Dec 1997 01:32:12 +0000 (01:32 +0000)]
p4raw-id: //depot/ansiperl@376

1  2 
perl.h
t/lib/thread.t
t/op/nothread.t

diff --cc perl.h
Simple merge
diff --cc t/lib/thread.t
index 798adc1,9810ae4..9810ae4
mode 100644,100755..100644
diff --cc t/op/nothread.t
index acc2089,7d42d27..7d42d27
mode 100644,100755..100644