Ferdi Franceschini e6e3c3be52 Merged in-situ modifications for Release 2.5 candidate 5 ...

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines

2012-11-15 17:00:43 +11:00

..

anticollider

Remove keywords to simplify merging branches.

2012-11-15 16:59:06 +11:00

chopper

Publish chopper::ready? and get_frequency procs.

2012-11-15 16:56:30 +11:00

commands

Merged in-situ modifications for Release 2.5 candidate 5

2012-11-15 17:00:43 +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

sct_protek608.c

2012-11-15 17:00:29 +11:00

motors

Merged in-situ modifications for Release 2.5 candidate 5

2012-11-15 17:00:43 +11:00

nexus

SICS-294 anstohttp.c

2012-11-15 16:57:04 +11:00

parameters

Merged in-situ modifications for Release 2.5 candidate 5

2012-11-15 17:00:43 +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

Merges from ics1-wombat

2012-11-15 16:57:39 +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