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

..

config

Merge branch 'Echidna' into temp

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

Pull various config files closer into alignment

2014-11-20 15:56:30 +11:00

echidna_configuration.tcl

Pullback from Echidna 2015-02-19

2015-02-19 11:43:50 +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