Changeset 6307


Ignore:
Timestamp:
May 4, 2016 2:38:02 AM (8 years ago)
Author:
ldelgass
Message:

merge r6291 from 1.6 branch

Location:
branches/1.7
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/1.7

  • branches/1.7/builder/scripts/templates/clang.tl

    r3177 r6307  
    180180        $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
    181181
     182install:
     183
    182184clean:
    183185        $(RM) @@FILEROOT@@c run*.xml
  • branches/1.7/builder/scripts/templates/fortran77.tl

    r3177 r6307  
    179179        $(FC) $(FCFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
    180180
     181install:
     182
    181183clean:
    182184        $(RM) @@FILEROOT@@f77 run*.xml
  • branches/1.7/builder/scripts/templates/java.tl

    r3177 r6307  
    126126        $(JAVAC) $(CLASSPATH) $<
    127127
     128install:
     129
    128130clean:
    129131        $(RM) @@FILEROOT@@.class run*.xml
  • branches/1.7/gui/scripts/gauge.tcl

    r5710 r6307  
    636636    $itk_component(spindn) configure -state $itk_option(-state)
    637637    $itk_component(presets) configure -state $itk_option(-state)
     638    if { [info exists itk_component(uq)] } {
     639        $itk_component(uq) configure -state $itk_option(-state)
     640    }
    638641    _redraw  ;# fix gauge
    639642}
     
    756759
    757760        $popup configure \
    758         -deactivatecommand [itcl::code $this _pop_uq_deactivate]
     761            -deactivatecommand [itcl::code $this _pop_uq_deactivate]
    759762    }
    760763    update
Note: See TracChangeset for help on using the changeset viewer.