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
728ab102b9
Make it compile with WAUDIT=2 and FORMAT_AUDIT set. Based on tips
...
by Bill Sommerfeld.
Also, don't change code that's not in our path (replacing vnprintf
with vsnprintf in !HAVE_VSNPRINTF case).
2000-11-21 01:35:36 +00:00
wiz
8a09ffd10e
Import of am-utils-6.0.4 source for reachover build.
...
Changes: quoted RCS Ids in all files, added NetBSD's own in most,
and removed some easily regenerated files in doc/.
(amd2netbsd script will follow soon.)
2000-11-19 23:42:08 +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
