Douglas Clowes 3ce5ae0977 Merge branch 'RELEASE-3_1' ...

Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py

2014-11-06 14:13:20 +11:00

..

anticollider

Remove superfluous trailing white space from TCL files

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

commands

SICS-795 Bring GIT up to date with changes made on ics1-wombat.

2014-10-08 20:29:23 +11:00

counter

Remove superfluous trailing white space from TCL files

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

environment

Remove superfluous trailing white space from TCL files

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

hipadaba

Remove superfluous trailing white space from TCL files

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

hmm

SICS-795 Bring GIT up to date with changes made on ics1-wombat.

2014-10-08 20:29:23 +11:00

motors

SICS-795 Bring GIT up to date with changes made on ics1-wombat.

2014-10-08 20:29:23 +11:00

nexus

SICS-294 anstohttp.c

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

plc

Remove superfluous trailing white space from TCL files

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

scan

server_config.tcl

2012-11-15 13:39:55 +11:00

INSTCFCOMMON.TXT

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

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

Makefile

Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.

2012-11-15 13:29:33 +11:00