Ferdi Franceschini b6ed01fc13 Merge changes made in-situ. ...

r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines

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

..

anticollider

Prevent x/y translation of detector when voltage >= 800V

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

Add lakeshore config for RHQ

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

hipadaba

Merged new hdb and nexus code.

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

hmm

Merge changes made in-situ.

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

motors

Merge changes made in-situ.

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

nexus

Merged 2.4 branch

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

optics

SICS-294 anstohttp.c

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

parameters

SICS-354 nxscripts_common_1.tcl

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

plc

Change over to Quokka SIS PLC address

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

scan

server_config.tcl

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

source

pelican

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

velsel

Merges from ics1-wombat

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