Douglas Clowes 92539b80aa Merge branch 'Kookaburra' into temp ...

Conflicts:
	sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/kookaburra/config/anticollider/acscript.txt

2015-02-19 15:54:22 +11:00

..

anticollider

Pullback from Kookaburra 2015-02-19

2015-02-19 15:51:41 +11:00

chopper

Remove superfluous trailing white space from TCL files

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

commands

Remove superfluous trailing white space from TCL files

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

counter

Remove trailing spaces and blank lines from sct_bm.tcl

2015-01-08 11:41:09 +11:00

hipadaba

init config for kookaburra

2012-11-15 17:25:06 +11:00

hmm

Pull back changes in Kookaburra config

2014-07-07 14:48:12 +10:00

motors

Pullback from Kookaburra 2015-02-19

2015-02-19 15:51:41 +11:00

nexus

init config for kookaburra

2012-11-15 17:25:06 +11:00

parameters

SICS-806 Add extra parameters to Kookaburra hdf.

2014-10-17 16:42:49 +11:00

plc

Remove superfluous trailing white space from TCL files

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

scan

Pullback from Kookaburra 2015-02-19

2015-02-19 15:51:41 +11:00

INSTCFCOMMON.TXT

Let everyone have a magnet sample stick motor.

2014-08-06 10:08:12 +10:00

Makefile

init config for kookaburra

2012-11-15 17:25:06 +11:00