Ferdi Franceschini c73c4c85c8 Merges from ics1-wombat ...

r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines

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

..

anticollider

Merged changes made in-situ

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

commands

Merges from ics1-wombat

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

counter

server_config.tcl

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

environment/temperature

Added west400.tcl config to wombat config/environment/temperature

2012-11-15 13:43:08 +11:00

hipadaba

Use new common hipada config file.

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

hmm

Merges from ics1-wombat

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

motors

Merges from ics1-wombat

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

nexus

SICS-294 anstohttp.c

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

plc

Don't make plc object when in simulated mode.

2012-11-15 13:29:48 +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

Merged 2.4 branch

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