Changeset 1815


Ignore:
Timestamp:
Nov 4, 2010 12:51:15 PM (9 years ago)
Author:
lou
Message:

Back merge stable/0.6 r1813:1814 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

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