Ferdi Franceschini a8203ffa6e Copied changes which were made in-situ. ...

r3236 | ffr | 2011-08-02 14:20:46 +1000 (Tue, 02 Aug 2011) | 2 lines

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

..

config

Copied changes which were made in-situ.

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

DMC2280

Merging release 2.0 branch with CVS trunk

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

script_validator

Merged 2.4 branch

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

util/dmc2280

Remove keywords to simplify merging branches.

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

Makefile

Merged new hdb and nexus code.

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

MANIFEST.TXT

Merging release 2.0 branch with CVS trunk

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

platypus_configuration.tcl

Don't load Bruker driver by default. This should really go in the extraconfig file.

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

script_validator_ports.tcl

Merged 2.4 branch

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

sics_ports.tcl

Merged 2.4 branch

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