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

..

config

Checked files modified by the merge with:

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

hipd

Tidied up indents etc, to make it easy to compare diffs against the echidna config.

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

hrpd

Fixed botched merge.

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

pas/DMC2280

New DMC folder

2012-11-15 12:50:39 +11:00

qld

Change InstXML extension from .tcl to .xml

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

reflectometer

Added "master" motor name lists for configurable virtualmotors.

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

rsd

no message

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

sans

no message

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

tas/DMC2280

New DMC folder

2012-11-15 12:50:39 +11:00

TEST_SICS

Allow list expressions like MG _TDA,_TPA

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

util

Merged Release 1.2

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

deploySICS.sh

update some comments and remove CVS directories that have crept in

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

gen_home_slits.tcl

Restored accidentally removed file.

2012-11-15 12:51:16 +11:00

genCLOSLOOP.tcl

Restored accidentally removed file.

2012-11-15 12:51:16 +11:00

MANIFEST.TXT

Modified to for new util, config directory structure.

2012-11-15 12:59:28 +11:00

mksim_config.tcl

Modified to for new util, config directory structure.

2012-11-15 12:59:28 +11:00

server_config.tcl

Added motor_simulation flag. If true then the motor_configuration.tcl files should create ANSTO simulated motor drivers.

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