Ferdi Franceschini 5b683ecbe0 Fixed botched merge. ...

The merge effectively created  duplicate setmode procs.

r1953 | ffr | 2007-05-10 13:28:27 +1000 (Thu, 10 May 2007) | 3 lines

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

..

counter

Create beam monitor in instrument specific configuration and provide option for creating simulated beam monitor driver.

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

hipadaba

Merged Release 1.2

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

hmm

Fixed botched merge.

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

motors

Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280.

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

nexus

Checked files modified by the merge with:

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

plc

Merged Release 1.2

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

scan

Modified to use common configuration

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

INSTCFCOMMON.TXT

Merged Release 1.2

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

Makefile

Make nexus dics

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