Commit Graph

13 Commits

Author SHA1 Message Date
christos a58881f52e resolve conflicts 2006-02-05 16:28:55 +00:00
rpaulo 32f8c84662 Merge am-utils 6.1.2.1. 2005-09-20 17:57:44 +00:00
christos 70a4c9e35e Resolve conflicts. 2005-04-23 18:38:17 +00:00
christos 763bdaa346 Resolve conflicts. 2004-11-27 01:24:35 +00:00
itojun 1b6fd89dfb use bounded string ops as much as possible. 2003-07-15 09:01:15 +00:00
itojun b40f711799 use strlcpy 2003-07-14 17:20:13 +00:00
christos 1a6788bb65 resolve conflicts. 2003-03-09 01:38:38 +00:00
thorpej 2f1985f790 Avoid conflict with reserved identifier "log". 2002-12-06 03:50:35 +00:00
christos 14b02a1cfc resolve conflicts. 2002-11-29 23:06:22 +00:00
veego fc85452e83 Resolve conflicts from the import of am-utils 6.0.6. 2001-05-13 18:06:57 +00:00
wiz 0d632f7ea0 Merge changes to previous version and some NetBSD tag differences. 2000-11-20 00:02:56 +00:00
dogcow 17fd16762b pull up christos's amd patches that didn't make it into 6.0.3
(derived from diff'ing am-utils 6.0.1s10 and basesrc/usr.sbin/amd)
2000-06-16 02:10:12 +00:00
dogcow fda6698809 Import of am-utils-6.0.3 virgin source, with the following changes:
"$Id: blah$" => "Id: blah" (as well as for $Header:$) for all files
 "$NetBSD: $" added to the top of all .c and .h files
2000-06-07 00:52:18 +00:00