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

Conflicts:
	sics/site_ansto/instrument/dingo/dingo_configuration.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl

2015-03-13 15:44:32 +11:00

..

config

Pullback from Pelican 2015-02-19

2015-02-19 11:24:44 +11:00

DMC2280

add Pelican

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

script_validator

add Pelican

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

util

Bring config INI files up to date with new drivers and fix some errors.

2015-03-13 13:09:15 +11:00

hostport_config_test.tcl

Added HMSTAT hostports for pelican.

2013-05-08 11:26:02 +10:00

hostport_config.tcl

Added HMSTAT hostports for pelican.

2013-05-08 11:26:02 +10:00

Makefile

add Pelican

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

MANIFEST.TXT

Add sics_simulation.tcl to each instrument MANIFEST.TXT file

2014-09-10 10:14:46 +10:00

pelican_configuration.tcl

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

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

add Pelican

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

sics_ports.tcl

add Pelican

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

sics_simulation.tcl

Break simulation flagss out of the server_config.tcl

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