Douglas Clowes 648c8003b7 Merge from Wombat, except sics_config.ini ...

Conflicts:
	sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/hmm/hmm_object.tcl
	sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini
	sics/site_ansto/instrument/server_config.tcl

2014-06-25 13:35:28 +10:00

..

config

Merge from Wombat, except sics_config.ini

2014-06-25 13:35:28 +10:00

DMC2280

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

script_validator

Remove superfluous trailing white space from TCL files

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

util

Sort the *.ini files so we can better compare them

2014-06-24 17:22:46 +10:00

extraconfig.tcl

Added some examples which set a fiew variables.

2012-11-15 13:03:10 +11:00

hostport_config_test.tcl

SICS-587 Setup hostport dictionary based configuration for Wombat.

2013-06-21 09:07:56 +10:00

hostport_config.tcl

SICS-587 Setup hostport dictionary based configuration for Wombat.

2013-06-21 09:07:56 +10:00

instrument_vars.tcl

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

Makefile

Added new hdb/nexus support.

2012-11-15 13:22:40 +11:00

MANIFEST.TXT

SICS-587 Setup hostport dictionary based configuration for Wombat.

2013-06-21 09:07:56 +10: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

wombat_configuration.tcl

Merge from Wombat, except sics_config.ini

2014-06-25 13:35:28 +10:00