Ferdi Franceschini 6c6156174f Manually merged the following changes from RELEASE-2_0P1 ...

commands_common.tcl
fixed counter feedback

anticollider_common.tcl
implement anticollider administrative override

reflectometer,sans/.../anticollider.tcl
implement administrative override to move detector

r2626 | ffr | 2008-06-12 12:55:28 +1000 (Thu, 12 Jun 2008) | 11 lines

2012-11-15 13:39:18 +11:00

..

config

Manually merged the following changes from RELEASE-2_0P1

2012-11-15 13:39:18 +11:00

DMC2280

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

script_validator

reorganised configuration tree

2012-11-15 13:09:35 +11:00

util/dmc2280

reorganised configuration tree

2012-11-15 13:09:35 +11:00

Makefile

Merged new hdb and nexus code.

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

MANIFEST.TXT

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

platypus_configuration.tcl

Merged release 2.0 patch-set 1 (RELEASE-2_0P1 )

2012-11-15 13:39:10 +11:00

script_validator_ports.tcl

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

sics_ports.tcl

reorganised configuration tree

2012-11-15 13:09:22 +11:00