6 Commits

Author	SHA1	Message	Date
joda	da086653ff	resolve import conflicts	2002-09-12 13:18:49 +00:00
assar	5b9616a3e3	merge heimdal 0.4e	2001-09-17 12:32:33 +00:00
assar	df54fb31c9	merge in conflicts after 0.3f import	2001-06-19 22:39:52 +00:00
thorpej	f4872dded4	Reduce diffs with 0.3e (mostly, complete the merge).	2001-04-07 21:29:20 +00:00
assar	7a16662ba0	import of heimdal 0.3e	2001-02-11 13:51:06 +00:00
assar	7f5f475a8b	import of heimdal 0.3a	2000-08-02 19:57:59 +00:00