Changeset 2001 for stable


Ignore:
Timestamp:
Dec 26, 2013 6:16:30 PM (5 years ago)
Author:
tkr
Message:

Merging r2000 from trunk

Location:
stable/2.8/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/src/Makefile.am

    r1992 r2001  
    272272        test -s cbc.exe.manifest && \
    273273        mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    274         cp cbc.exe $(bindir)/clp.exe
     274        cp cbc.exe $(bindir)/cbc.exe
    275275endif
    276276
  • stable/2.8/Cbc/src/Makefile.in

    r1992 r2001  
    11771177@COIN_CXX_IS_CL_TRUE@   test -s cbc.exe.manifest && \
    11781178@COIN_CXX_IS_CL_TRUE@   mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    1179 @COIN_CXX_IS_CL_TRUE@   cp cbc.exe $(bindir)/clp.exe
     1179@COIN_CXX_IS_CL_TRUE@   cp cbc.exe $(bindir)/cbc.exe
    11801180
    11811181#######################################################################
Note: See TracChangeset for help on using the changeset viewer.