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

Merged 2.4 branch

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

util

SICS-797: Bring GIT up to date with changes made on ics1-quokka

2014-10-09 14:21:10 +11:00

hostport_config_test.tcl

Don't use the SICS telnet port for the fake velocity selector.

2013-10-28 15:33:41 +11:00

hostport_config.tcl

Adding updates from ics1-quokka

2013-05-21 16:21:47 +10:00

Makefile

Merged new hdb and nexus code.

2012-11-15 13:21:03 +11:00

MANIFEST.TXT

Add sics_simulation.tcl to each instrument MANIFEST.TXT file

2014-09-10 10:14:46 +10:00

quokka_configuration.tcl

Fix directories for quokka_configuration.tcl

2014-09-11 15:35:31 +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