Douglas Clowes 507ddafb2a Merge branch 'RELEASE-3_1' into RELEASE-3_2 ...

Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl

2014-08-06 13:53:18 +10:00

..

config

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

2014-08-06 13:53:18 +10: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/dmc2280

Remove keywords to simplify merging branches.

2012-11-15 16:59:06 +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

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

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

platypus_configuration.tcl

Change the names in all of the files

2014-07-23 17:30:44 +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