Douglas Clowes
14be249401
Pullback from Wombat 2015-02-19
2015-02-19 11:51:51 +11:00
Douglas Clowes
c8057a89aa
Changes pulled back from Wombat 2014-09-09
2014-09-09 14:52:47 +10:00
Douglas Clowes
648c8003b7
Merge from Wombat, except sics_config.ini
...
Conflicts:
sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/config/hmm/hmm_object.tcl
sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/hipd/util/sics_config.ini
sics/site_ansto/instrument/server_config.tcl
2014-06-25 13:35:28 +10:00
Douglas Clowes
92d3acb5d5
Remove superfluous trailing white space from TCL files
2014-05-16 17:23:58 +10:00
Ferdi Franceschini
71b71e262c
Added eulerscan.tcl from ics1-wombat
...
Updated to get in-situ changes to motor configurations (eg monochromator resolvers)
r3072 | ffr | 2011-02-25 19:12:19 +1100 (Fri, 25 Feb 2011) | 2 lines
2012-11-15 17:08:50 +11:00
