Changeset 1802 for trunk


Ignore:
Timestamp:
Nov 3, 2010 12:53:19 PM (9 years ago)
Author:
lou
Message:

Merge stable/0.6 r1801 into trunk.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/prepare_new_stable

    r1715 r1802  
    674674        ext_minVer=`expr $ext_minVer + 1`
    675675        ext_url=`replaceVersionInURL $ext_url $ext_majVer $ext_minVer`
    676         if ! expr "$ext_url" : '.*/Data/.*' >/dev/null 2>&1 ; then
     676        # pre-1.1 Data configuration
     677        if ! expr "$ext_url" : '.*/Data/trunk/.*' >/dev/null 2>&1 ; then
    677678          ext_url="${ext_url}${ext_proj}"
    678679        fi
Note: See TracChangeset for help on using the changeset viewer.