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

Remove superfluous trailing white space from TCL files

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

commands

SICS-477 Set the detector type to "bmon" for Taipan and lock it so that

2012-11-15 17:30:01 +11:00

counter

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

2015-02-06 08:48:11 +11:00

environment

Remove superfluous trailing white space from TCL files

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

hipadaba

update for Taipan purpose

2012-11-15 17:10:14 +11:00

hmm

Histogram memory configuration for Taipan Be filter configuration.

2014-08-28 13:59:35 +10:00

motors

Tilt configuration from Taipan 2015-02-19

2015-02-19 10:35:21 +11:00

nexus

r3100 | jgn | 2011-04-11 11:34:11 +1000 (Mon, 11 Apr 2011) | 1 line

2012-11-15 17:10:18 +11:00

optics

r3098 | jgn | 2011-04-08 16:16:38 +1000 (Fri, 08 Apr 2011) | 1 line

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

plc

Remove superfluous trailing white space from TCL files

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

scan

updated Taipan

2012-11-15 17:07:16 +11:00

tasmad

Remove superfluous trailing white space from TCL files

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

INSTCFCOMMON.TXT

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

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

Makefile

r3095 | jgn | 2011-04-08 12:34:34 +1000 (Fri, 08 Apr 2011) | 1 line

2012-11-15 17:09:57 +11:00