8cf404da0f
add a NetBSD_DISABLED_* target for config.h.in.
2009-04-19 10:22:10 +00:00
04eef3cfd2
resolve conflicts, fix build.
2008-08-30 12:16:51 +00:00
910040d09f
welcome to file 4.18. have a nice day.
2006-10-31 21:16:23 +00:00
61f5a53c25
con conflicts into going away
2005-10-17 17:59:59 +00:00
5b40621389
conflicts
2005-02-21 15:00:04 +00:00
47d5603068
don't build magic and doc in toolbuild => makes build work again
2004-12-14 16:56:56 +00:00
0127e87a6e
regen with AM_MAINTAINER_MODE enabled to get rid of autoconfusion
...
rebuild mania
2004-12-14 16:08:01 +00:00
ebbb05cb75
munge conflicts
2004-12-13 10:35:03 +00:00
0fa4e65c16
the conflict peril was no more
2004-04-08 12:29:45 +00:00
dab8aad33e
conflicts begone
2004-03-23 08:40:11 +00:00
986a1e50c3
merge conflicts from 4.06 import
2003-10-27 16:22:35 +00:00
b7cf51b493
post-import merge
2003-09-25 18:08:18 +00:00
90651bdae0
there is no conflict, you are receding
2003-05-25 21:46:09 +00:00
9b9c82ab77
regenerate for AM_MAINTAINER_MODE, this time with "autoreconf -f" ...
2003-03-27 06:13:42 +00:00
507ffb08d9
Remove any rules which ``helpfully'' rerun automake, autoheader, or
...
autoconf if make determines that any of the files are out of date.
Unfortunately, this can occur quite easily after a cvs update, and
will then fail on systems without any of those tools or with read-only
source, and thus generate lots of "it doesn't build" email and bug
reports. If/when we have a better solution in tree, this is how we fix it.
2003-03-26 08:59:40 +00:00
c10bc02261
file 4.00
2003-03-25 22:29:42 +00:00
mrg