Douglas Clowes
|
c3bb4a9591
|
Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
sics/site_ansto/instrument/pelican/pelican_configuration.tcl
|
2015-01-07 13:09:27 +11:00 |
|
Douglas Clowes
|
892ca1cdc5
|
Merge branch 'RELEASE-3_1'
|
2014-11-20 15:11:56 +11:00 |
|
Douglas Clowes
|
86d4732b06
|
Regenerate SCT drivers
|
2014-11-13 13:43:51 +11:00 |
|
Douglas Clowes
|
38dff05881
|
Regenerate SCT drivers
|
2014-11-13 12:38:03 +11:00 |
|
Douglas Clowes
|
3450b4cbf9
|
Regenerate SCT drivers
|
2014-11-13 12:35:46 +11:00 |
|
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 |
|
Douglas Clowes
|
2076c0a5fc
|
New generated SCT drivers for knauer, sr630 and epson robot wrapper
|
2014-11-06 13:40:06 +11:00 |
|