Ignore:
Timestamp:
Dec 16, 2013 11:27:56 AM (6 years ago)
Author:
tkr
Message:

Reverse merging r2007. Ignore the commit message on that one. I made a mistake

Location:
stable/1.15/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/OsiClp

  • stable/1.15/Clp/src/OsiClp/Makefile.in

    r2007 r2009  
    106106AMTAR = @AMTAR@
    107107AR = @AR@
    108 ASL_CFLAGS = @ASL_CFLAGS@
    109 ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
    110 ASL_DATA = @ASL_DATA@
    111 ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
    112 ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
    113 ASL_LIBS = @ASL_LIBS@
    114 ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
    115108AUTOCONF = @AUTOCONF@
    116109AUTOHEADER = @AUTOHEADER@
     
    155148COIN_HAS_AMD_FALSE = @COIN_HAS_AMD_FALSE@
    156149COIN_HAS_AMD_TRUE = @COIN_HAS_AMD_TRUE@
    157 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    158 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
    159150COIN_HAS_BLAS_FALSE = @COIN_HAS_BLAS_FALSE@
    160151COIN_HAS_BLAS_TRUE = @COIN_HAS_BLAS_TRUE@
Note: See TracChangeset for help on using the changeset viewer.