Douglas Clowes 44f6b65aef Merge branch 'RELEASE-3_1' into RELEASE-3_2 ...

Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl

2014-08-19 11:46:24 +10:00

..

anticollider

Changed aperture rule to allow driving apertures up past 5 degrees.

2014-06-17 12:30:52 +10:00

chopper

Regenerate template drivers

2014-08-19 11:43:45 +10:00

commands

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

counter

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

hipadaba

Initial bilby configuration.

2014-01-15 16:31:14 +11:00

hmm

Pull back configurations changes from Bilby

2014-06-04 15:17:35 +10:00

motors

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2014-08-19 11:46:24 +10:00

nexus

Initial bilby configuration.

2014-01-15 16:31:14 +11:00

optics

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

plc

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

scan

Initial bilby configuration.

2014-01-15 16:31:14 +11:00

INSTCFCOMMON.TXT

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2014-08-06 13:53:18 +10:00