Douglas Clowes f269a17ef3 Merge branch 'RELEASE-3_1' into RELEASE-3_2 ...

Conflicts:
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl

2015-03-05 13:53:47 +11:00

..

aerolas_doppler_sct.tcl

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2015-01-07 13:09:27 +11:00

aerolas_doppler.sct

Port new Aerolas Doppler driver from RELEASE-3_1

2015-01-07 10:29:07 +11:00

he3_polanal_sct.tcl

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2015-03-05 13:53:47 +11:00

he3_polanal.sct

Changes to get and set the field coil values

2015-02-16 12:38:02 +11:00