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

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

2015-03-05 13:53:47 +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

Added fake disk chopper controller.

2013-04-23 14:32:24 +10:00

hostport_config.tcl

Copied modifications from ics1-platypus.

2013-10-29 09:06:57 +11: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

platypus_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

Pullback from Platypus 2015-02-19

2015-02-19 11:30:48 +11:00