COIN-OR::LEMON - Graph Library

Changeset 321:a412d990f043 in lemon-main


Ignore:
Timestamp:
10/12/08 20:59:06 (16 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
319:5e12d7734036 (diff), 320:34e185734b42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r310 r321  
    55
    66EXTRA_DIST = \
     7        AUTHORS \
    78        LICENSE \
    89        m4/lx_check_cplex.m4 \
  • Makefile.am

    r320 r321  
    1010        m4/lx_check_glpk.m4 \
    1111        m4/lx_check_soplex.m4 \
    12         CMakeLists.txt
     12        CMakeLists.txt \
     13        cmake
    1314
    1415pkgconfigdir = $(libdir)/pkgconfig
     
    2526bin_PROGRAMS =
    2627check_PROGRAMS =
     28dist_bin_SCRIPTS =
    2729TESTS =
    2830XFAIL_TESTS =
     
    3234include doc/Makefile.am
    3335include demo/Makefile.am
    34 include benchmark/Makefile.am
    3536include tools/Makefile.am
    3637
Note: See TracChangeset for help on using the changeset viewer.