pooka
9afe6367b3
crunch cornflakes
2007-06-07 11:32:44 +00:00
pooka
17dbe768ca
apply conflict therapy for 4.20 import
2007-03-04 15:22:07 +00:00
pooka
910040d09f
welcome to file 4.18. have a nice day.
2006-10-31 21:16:23 +00:00
pooka
61f5a53c25
con conflicts into going away
2005-10-17 17:59:59 +00:00
pooka
5b40621389
conflicts
2005-02-21 15:00:04 +00:00
pooka
0127e87a6e
regen with AM_MAINTAINER_MODE enabled to get rid of autoconfusion
...
rebuild mania
2004-12-14 16:08:01 +00:00
pooka
8d312437e8
wage holy war on autoconf to attempt to make the toolbuild work
...
After receiving the magic 10-line incantation from Christos for
re-building the autoconf stuff, attempt to do so. This might fix
the problem, or might not. That is why this stuff is so fun.
2004-12-13 23:57:44 +00:00
pooka
f5200852b4
python has wriggled itself in here, yank it out to make the toolbuild work.
2004-12-13 10:43:39 +00:00
pooka
ebbb05cb75
munge conflicts
2004-12-13 10:35:03 +00:00
pooka
d22e9f2216
conflict therapy
2004-09-16 13:49:07 +00:00
pooka
b6a1a17518
Apply patch from Christos to fix build on FreeBSD 4
2004-04-08 12:33:20 +00:00
pooka
0fa4e65c16
the conflict peril was no more
2004-04-08 12:29:45 +00:00
pooka
dab8aad33e
conflicts begone
2004-03-23 08:40:11 +00:00
pooka
986a1e50c3
merge conflicts from 4.06 import
2003-10-27 16:22:35 +00:00
pooka
b7cf51b493
post-import merge
2003-09-25 18:08:18 +00:00
pooka
90651bdae0
there is no conflict, you are receding
2003-05-25 21:46:09 +00:00
lukem
932f26073f
Add AM_MAINTAINER_MODE to configure.in
...
Run "autoreconf" (from autoconf-2.57) to rebuild:
aclocal.m4 config.h.in configure
This appears to be a cleaner solution than hand-hacking/merging
changes to **/Makefile.in after each import.
Recently suggested by a couple of people, and confirmed with Ben Elliston.
2003-03-27 03:47:25 +00:00
pooka
c10bc02261
file 4.00
2003-03-25 22:29:42 +00:00
