Ferdi Franceschini e31aa973a6 Merged release 2.1 ...

r2664 | ffr | 2008-07-18 14:33:39 +1000 (Fri, 18 Jul 2008) | 2 lines

2012-11-15 13:40:36 +11:00

..

anticollider

Manually merged the following changes from RELEASE-2_0P1

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

chopper

Fix Chopper IP address

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

commands

Merging release 2.0 branch with CVS trunk

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

counter

hmm_configuration_common_1.tcl

2012-11-15 13:40:27 +11:00

hipadaba

Merging release 2.0 branch with CVS trunk

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

hmm

server_config.tcl

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

motors

Merged release 2.1

2012-11-15 13:40:36 +11:00

nexus

Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.

2012-11-15 13:29:33 +11:00

parameters

commands_common.tcl

2012-11-15 13:40:11 +11:00

plc

Change over to Platypus SIS PLC address

2012-11-15 13:36:13 +11:00

scan

server_config.tcl

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

source

pelican

2012-11-15 13:40:07 +11:00

INSTCFCOMMON.TXT

pelican

2012-11-15 13:40:07 +11:00

Makefile

Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.

2012-11-15 13:29:33 +11:00