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

commands

pulser and hvcommands are available in the common config/commands path

2012-11-15 17:23:58 +11:00

counter

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

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

environment

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

Remove superfluous trailing white space from TCL files

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

motors

Pullback from Echidna 2015-02-19

2015-02-19 11:43:50 +11:00

nexus

Merged 2.4 branch

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

INSTCFCOMMON.TXT

Change names from sct_*.tcl to *_sct.tcl in config/deploy files

2015-01-22 13:16:09 +11: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