Douglas Clowes 4e383b2af2 Merge branch 'Echidna' into temp ...

Conflicts:
	sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl

2015-02-19 14:57:43 +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

Remove superfluous trailing white space from TCL files

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

Copy changes made to ics1-echidna since R31C20 deployment.

2014-11-12 17:24:23 +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