Fix of conflict remains
commit283f21c09d392e3277c2e46107b39a8bf2db6228
authorlclausen <lclausen>
Thu, 20 Apr 2006 05:04:07 +0000 (20 05:04 +0000)
committerlclausen <lclausen>
Thu, 20 Apr 2006 05:04:07 +0000 (20 05:04 +0000)
tree1eff1065a267e9031045e7e43c2f080d20146117
parentbc6e8b2dcc2a165951df25dcbfcd97bea888b1ca
Fix of conflict remains
configure.in