Ignore:
Timestamp:
Mar 20, 2016, 2:53:27 AM (9 years ago)
Author:
ldelgass
Message:

merge r6079 from trunk

Location:
branches/1.5
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/1.5

    • Property svn:mergeinfo changed
      /trunkmerged: 6079

  • branches/1.5/configure

    r6058 r6157  
    628628VTK_VERSION
    629629VTK_TCL_DIR
     630TK_XLIBSW
    630631TK_VERSION
    631 TK_XLIBSW
    632632TK_LIB_SPEC
    633633TK_INC_SPEC
    … …  
    637637TCL_SHLIB_LD
    638638TCL_SHLIB_CFLAGS
     639TCL_LIB_SPEC
     640TCL_INC_SPEC
    639641TCL_CFLAGS_OPTIMIZE
    640642TCL_CFLAGS_DEBUG
    641 TCL_LIB_SPEC
    642 TCL_INC_SPEC
     643SVN_VERSION
     644SVN_URL
    643645SIZEOF_VOID_P
    644646SIZEOF_LONG_LONG
    … …  
    672674OCTAVE_VERSION_MAJOR
    673675OCTAVE_VERSION
    674 SVN_URL
    675 SVN_VERSION
    676676MKOCTFILE3
    677677MKOCTFILE2
    … …  
    1020410204
    1020510205
    10206 
    10207 
    10208 
    10209 
    10210 
    10211 
    1021210206ac_configure_args="--disable-threads --enable-shared"
    1021310207
Note: See TracChangeset for help on using the changeset viewer.