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

..

anticollider

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10: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