Douglas Clowes 8b4ab411fd Merge branch 'Wombat' into temp ...

Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/hipd/config/commands/commands.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini

2015-02-19 15:26:13 +11:00

..

anticollider

Remove superfluous trailing white space from TCL files

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

commands

Pullback from Wombat 2015-02-19

2015-02-19 11:51:51 +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

Pullback from Wombat 2015-02-19

2015-02-19 11:51:51 +11:00

motors

Merge branch 'Wombat' into temp

2015-02-19 15:26:13 +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

Deploy all environment control drivers.

2014-08-06 10:08:10 +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