Douglas Clowes 30c23b1e0a Merge branch 'RELEASE-3_1' ...

Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps.sct
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/util/gen_sct.py

2014-11-13 13:52:46 +11:00

..

anticollider

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

beamline

Merge from Quokka sans sct_flipper, environment, motor_config

2014-06-25 17:09:22 +10:00

commands

SICS-458: Add dsc command to run a DSC acquisition on Quokka.

2014-08-26 10:32:43 +10:00

counter

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

environment

Wrapper code for legacy drivers.

2014-07-15 08:59:18 +10:00

goniometer

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

hipadaba

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

hmm

SICS-723 Provide a detector/reset_trip node to notify GumTree and allow reset.

2014-11-07 09:44:34 +11:00

motors

Select sample changer from sics_config.ini

2014-07-07 09:15:54 +10:00

nexus

Merged 2.4 branch

2012-11-15 16:57:26 +11:00

optics

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

parameters

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

plc

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

scan

server_config.tcl

2012-11-15 13:39:55 +11:00

velsel

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

INSTCFCOMMON.TXT

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

2014-08-06 13:53:18 +10:00

Makefile

Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.

2012-11-15 13:29:33 +11:00