# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 2009-04-29 16:54:30
# Node ID f5c710df882cf9ebd21f0b7f545d83a293b613af
# Parent  0286cb1ac78dcf5ded1701c171eb52c03d5f19ea
# Parent  70a356a461a5384c38abbd9979a786d6099c0ac8

Merge

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,11 +11,12 @@
 	m4/lx_check_cplex.m4 \
 	m4/lx_check_glpk.m4 \
 	m4/lx_check_soplex.m4 \
-	m4/lx_check_clp.m4 \
-	m4/lx_check_cbc.m4 \
+	m4/lx_check_coin.m4 \
 	CMakeLists.txt \
 	cmake/FindGhostscript.cmake \
+	cmake/FindCPLEX.cmake \
 	cmake/FindGLPK.cmake \
+	cmake/FindCOIN.cmake \
 	cmake/version.cmake.in \
 	cmake/version.cmake \
 	cmake/nsis/lemon.ico \