Douglas Clowes
|
3ce5ae0977
|
Merge branch 'RELEASE-3_1'
Conflicts:
sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
sics/site_ansto/instrument/pelican/pelican_configuration.tcl
sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
sics/site_ansto/instrument/util/gen_sct.py
|
2014-11-06 14:13:20 +11:00 |
|