Changeset 3234


Ignore:
Timestamp:
Jun 12, 2014 3:19:15 PM (5 years ago)
Author:
stefan
Message:

sync with trunk

Location:
ThirdParty/SCIP/stable/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/stable/1.3

  • ThirdParty/SCIP/stable/1.3/Makefile.am

    r3232 r3234  
    347347  scip/src/scip/nodesel_restartdfs.h \
    348348  scip/src/scip/nodesel_uct.h \
     349  scip/src/scip/presolve.h \
    349350  scip/src/scip/presol_boundshift.h \
    350351  scip/src/scip/presol_components.h \
     
    373374  scip/src/scip/pub_fileio.h \
    374375  scip/src/scip/pub_heur.h \
     376  scip/src/scip/pub_history.h \
    375377  scip/src/scip/pub_implics.h \
    376378  scip/src/scip/pub_lp.h \
  • ThirdParty/SCIP/stable/1.3/Makefile.in

    r3232 r3234  
    761761  scip/src/scip/nodesel_restartdfs.h \
    762762  scip/src/scip/nodesel_uct.h \
     763  scip/src/scip/presolve.h \
    763764  scip/src/scip/presol_boundshift.h \
    764765  scip/src/scip/presol_components.h \
     
    787788  scip/src/scip/pub_fileio.h \
    788789  scip/src/scip/pub_heur.h \
     790  scip/src/scip/pub_history.h \
    789791  scip/src/scip/pub_implics.h \
    790792  scip/src/scip/pub_lp.h \
Note: See TracChangeset for help on using the changeset viewer.