Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 29 Apr 2009 15:54:30 +0100
changeset 628f5c710df882c
parent 627 0286cb1ac78d
parent 624 70a356a461a5
child 629 4629e096e3af
Merge
     1.1 --- a/Makefile.am	Wed Apr 29 15:52:08 2009 +0100
     1.2 +++ b/Makefile.am	Wed Apr 29 15:54:30 2009 +0100
     1.3 @@ -11,11 +11,12 @@
     1.4  	m4/lx_check_cplex.m4 \
     1.5  	m4/lx_check_glpk.m4 \
     1.6  	m4/lx_check_soplex.m4 \
     1.7 -	m4/lx_check_clp.m4 \
     1.8 -	m4/lx_check_cbc.m4 \
     1.9 +	m4/lx_check_coin.m4 \
    1.10  	CMakeLists.txt \
    1.11  	cmake/FindGhostscript.cmake \
    1.12 +	cmake/FindCPLEX.cmake \
    1.13  	cmake/FindGLPK.cmake \
    1.14 +	cmake/FindCOIN.cmake \
    1.15  	cmake/version.cmake.in \
    1.16  	cmake/version.cmake \
    1.17  	cmake/nsis/lemon.ico \