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

..

anticollider

Remove superfluous trailing white space from TCL files

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

beamline

SICS-742 spin flipper is instructed to power up but doesn't reach the target current.

2014-10-15 09:14:58 +11:00

chopper

Remove superfluous trailing white space from TCL files

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

commands

Pull back Platypus Command changes

2014-06-24 12:36:53 +10:00

counter

Allow selecting histogram memory server as source of beam monitor counts.

2015-02-06 08:48:11 +11:00

hipadaba

Remove superfluous trailing white space from TCL files

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

hmm

Pullback from Platypus 2015-02-19

2015-02-19 11:30:48 +11:00

motors

Fix typo in Platypus motor_configuration.tcl

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

nexus

SICS-294 anstohttp.c

2012-11-15 16:57:04 +11: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

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