Changeset 1559 for trunk/Clp/inc


Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (10 years ago)
Author:
stefan
Message:

merge split branch into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        6 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        7 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558
  • trunk/Clp/inc/config_clp.h.in

    r1554 r1559  
    1010#undef COIN_CLP_VERBOSITY
    1111
    12 /* Define to 1 if the Clp package is used */
    13 #undef COIN_HAS_CLP
     12/* Define to 1 if the CoinUtils module is available */
     13#undef COIN_HAS_COINUTILS
    1414
    15 /* Define to 1 if the CoinUtils package is used */
    16 #undef COIN_HAS_COINUTILS
     15/* Define to 1 if the Netlib module is available */
     16#undef COIN_HAS_NETLIB
     17
     18/* Define to 1 if the Osi module is available */
     19#undef COIN_HAS_OSI
     20
     21/* Define to 1 if the OsiTests module is available */
     22#undef COIN_HAS_OSITESTS
    1723
    1824/* Define to 1 if readline is available */
    1925#undef COIN_HAS_READLINE
     26
     27/* Define to 1 if the Sample module is available */
     28#undef COIN_HAS_SAMPLE
    2029
    2130/* Define to 1 if you have the <dlfcn.h> header file. */
     
    7887/* Define to 2 if wssmp_ is available, and to 3 if wssmp is available */
    7988#undef WSSMP_BARRIER
     89
     90/* SVN revision number of project */
     91#undef _SVN_REV
     92
     93/* Version number of project */
     94#undef _VERSION
Note: See TracChangeset for help on using the changeset viewer.