Merge branch 'master' into bernstein
commit76b45d51f37259d4705fd262a31ec88b8aa902dc
authorSven Verdoolaege <skimo@kotnet.org>
Sat, 12 Aug 2006 14:44:20 +0000 (12 16:44 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Sat, 12 Aug 2006 14:44:20 +0000 (12 16:44 +0200)
tree877f4ea72fc52c2f699714e86b91a77b741194c4
parent7d09a989eff2942f97623876ba9e022814f9cef9
parentc52ff6e33507a865e4248bd23deebb817d583055
Merge branch 'master' into bernstein

Conflicts:

verify_main.cc
Makefile.am
configure.in
lexmin.cc