Ignore:
Timestamp:
Aug 14, 2011 6:45:31 AM (8 years ago)
Author:
stefan
Message:

merge chgset 1781 from trunk

Location:
stable/1.14
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14

    • Property svn:mergeinfo changed
      /trunkmerged: 1781
  • stable/1.14/Clp/test/Makefile.in

    r1753 r1782  
    341341@COIN_HAS_OSITESTS_TRUE@  $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    342342
    343 @COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
     343@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = \
    344344@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
    345 @COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     345@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
     346@COIN_HAS_OSITESTS_TRUE@        $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)
    346347
    347348@COIN_HAS_OSITESTS_TRUE@testdepend = osiUnitTest$(EXEEXT)
Note: See TracChangeset for help on using the changeset viewer.