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

..

config

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

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

DMC2280

Updated archive with code for handheld controller and eulerian omega

2012-11-15 17:20:58 +11:00

script_validator

Merged 2.4 branch

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

util

Load available environment controller configurations for kowari

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

hipadaba_configuration.tcl

Auto-generated from motor_configuration.tcl

2012-11-15 12:53:38 +11:00

hostport_config_test.tcl

SICS-587 Setup hostport dictionary based configuration for Kowari.

2013-06-21 11:23:41 +10:00

hostport_config.tcl

SICS-587 Setup hostport dictionary based configuration for Kowari.

2013-06-21 11:23:41 +10:00

hpaths.tcl

Remove superfluous trailing white space from TCL files

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

kowari_configuration.tcl

Change names from sct_*.tcl to *_sct.tcl in config/deploy files

2015-01-22 13:16:09 +11:00

kowari.hdd

Initial kowari configuration.

2012-11-15 12:48:49 +11:00

Makefile

Cleanup

2012-11-15 13:28:56 +11:00

MANIFEST.TXT

SICS-151 Remove extraconfig.tcl from remaining MANIFEST.TXT files

2015-01-23 12:28:53 +11:00

runsics_def.py

A new runsics script has been implemented in python (runsics.py).

2013-05-13 23:11:15 +10: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

sics_simulation.tcl

Break simulation flagss out of the server_config.tcl

2014-09-09 15:14:57 +10:00