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

..

config

Merge branch 'RELEASE-3_1'

2014-11-13 13:52:46 +11:00

DMC2280

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

script_validator

Remove superfluous trailing white space from TCL files

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

Test

Remove superfluous trailing white space from TCL files

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

util

Load some missing environment controller configurations for Echidna.

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

echidna_configuration.tcl

Copy changes made to ics1-echidna since R31C20 deployment.

2014-11-12 17:24:23 +11:00

extraconfig.tcl

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

hostport_config_test.tcl

SICS-587 Setup hostport dictionary based configuration for Echidna.

2013-06-21 11:13:42 +10:00

hostport_config.tcl

SICS-587 Setup hostport dictionary based configuration for Echidna.

2013-06-21 11:13:42 +10:00

instrument_vars.tcl

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

Makefile

Added new hdb/nexus support.

2012-11-15 13:22:40 +11:00

MANIFEST.TXT

Add an external sics_simulation file for Echidna

2014-09-08 15:54:29 +10:00

runsics_def.py

A new runsics script has been implemented in python (runsics.py).

2013-05-13 23:11:15 +10:00

script_validator_ports.tcl

Merged 2.4 branch

2012-11-15 16:57:26 +11:00

sics_ports.tcl

Merged 2.4 branch

2012-11-15 16:57:26 +11:00

sics_simulation.tcl

Break simulation flagss out of the server_config.tcl

2014-09-09 15:14:57 +10:00