Ferdi Franceschini fd6a955d6b Remove keywords to simplify merging branches. ...

r2859 | ffr | 2010-01-13 15:41:46 +1100 (Wed, 13 Jan 2010) | 2 lines

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

..

anticollider

Remove keywords to simplify merging branches.

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

commands

##################################

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

counter

hmm_configuration_common_1.tcl

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

environment

Merging changes made in-situ

2012-11-15 16:58:52 +11:00

hipadaba

Use new common hipada config file.

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

hmm

Merged 2.4 branch

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

motors

Remove keywords to simplify merging branches.

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

nexus

Merged 2.4 branch

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