Ignore:
Timestamp:
Oct 31, 2011 7:34:55 PM (8 years ago)
Author:
tkr
Message:

Merging r1750 and r1751 from trunk

Location:
stable/2.7/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7/Cbc

  • stable/2.7/Cbc/src/Cbc_ampl.cpp

    r1675 r1752  
    3030*/
    3131
     32#include "CbcConfig.h"
     33
    3234#ifdef COIN_HAS_ASL
    3335
    34 #include "CbcConfig.h"
    3536#ifdef HAVE_UNISTD_H
    3637# include "unistd.h"
     
    144145static Option_Info Oinfo = {
    145146    const_cast<char*>("cbc"),
    146     const_cast<char*>("Cbc 1.04"),
     147    const_cast<char*>("CBC trunk"),
    147148    const_cast<char*>("cbc_options"),
    148149    keywds,
Note: See TracChangeset for help on using the changeset viewer.