6 Commits

Author	SHA1	Message	Date
Mark Murray	24ad19c546	Resolve conflicts.	2000-08-20 09:51:08 +00:00
Mark Murray	a1a0102e72	Grr.. ... Fix FUBARred conflict-merge. This fixes "make world".	2000-06-25 20:12:58 +00:00
Mark Murray	2b0d64b9da	Resolve conflicts.	2000-06-25 13:05:26 +00:00
Mark Murray	c3180f4f12	Merge conflicts. More elegant improvements will follow in a couple ... of days.	1999-05-02 15:18:32 +00:00
Mark Murray	5c17a87bef	Part #1 of suidperl repair.	1998-09-24 17:20:46 +00:00
Mark Murray	ff6b7ba98e	Initial import of Perl5. The king is dead; long live the king!	1998-09-09 07:00:04 +00:00