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

Conflicts:
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl

2015-03-05 13:53:47 +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

Allow selecting histogram memory server as source of beam monitor counts.

2015-02-06 08:48:11 +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

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

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

Makefile

init config for kookaburra

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