Douglas Clowes 9ee2252138 Merge branch 'RELEASE-3_1' into RELEASE-3_2 ...

Conflicts:
	sics/site_ansto/instrument/dingo/dingo_configuration.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl

2015-03-13 15:44:32 +11:00

..

config

Rename and move the Rheometer drivers for Kookaburra

2015-03-05 14:11:54 +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

Bring config INI files up to date with new drivers and fix some errors.

2015-03-13 13:09:15 +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

SICS-151 Remove extraconfig.tcl from remaining MANIFEST.TXT files

2015-01-23 12:28:53 +11:00

quokka_configuration.tcl

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2015-03-13 15:44:32 +11: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