Ferdi Franceschini 59101a7d4d Merged Arndt's changes from trunk ...

version 20100114, deployed on Wombat Today, provides independent tolerance control for control loop one and two. AM

r2869 | ffr | 2010-01-15 09:48:17 +1100 (Fri, 15 Jan 2010) | 4 lines

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

..

config

Merged Arndt's changes from trunk

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

hipd

Remove keywords to simplify merging branches.

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

hrpd

Remove keywords to simplify merging branches.

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

pas

Remove keywords to simplify merging branches.

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

qld

Remove keywords to simplify merging branches.

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

reflectometer

Remove keywords to simplify merging branches.

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

rsd

Remove keywords to simplify merging branches.

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

sans

Remove keywords to simplify merging branches.

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

tas/DMC2280

no message

2012-11-15 13:24:09 +11:00

TEST_SICS

Remove keywords to simplify merging branches.

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

util

Remove obsolete hlistplainprop procedure.

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

barebones.tcl

Remove keywords to simplify merging branches.

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

deploySICS.sh

pelican

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

gumxml.tcl

Merges from ics1-wombat

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

MANIFEST.TXT

Merging release 2.0 branch with CVS trunk

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

mksim_config.tcl

Modified to for new util, config directory structure.

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

server_config.tcl

Put all cvs keyword references in one place to simplify merges.

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