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