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

SICS-820 Prevent m2om from being driven into sample holder.

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

chopper

Remove superfluous trailing white space from TCL files

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

commands

Remove superfluous trailing white space from TCL files

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

counter

Remove superfluous trailing white space from TCL files

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

hipadaba

init config for kookaburra

2012-11-15 17:25:06 +11:00

hmm

Pull back changes in Kookaburra config

2014-07-07 14:48:12 +10:00

motors

SICS-753: Add named positions for kookaburra sample changer samz.

2014-09-11 14:29:24 +10:00

nexus

init config for kookaburra

2012-11-15 17:25:06 +11:00

parameters

SICS-806 Add extra parameters to Kookaburra hdf.

2014-10-17 16:42:49 +11:00

plc

Remove superfluous trailing white space from TCL files

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

scan

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

init config for kookaburra

2012-11-15 17:25:06 +11:00