Douglas Clowes 507ddafb2a Merge branch 'RELEASE-3_1' into RELEASE-3_2 ...

Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl

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

..

anticollider

Remove superfluous trailing white space from TCL files

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

commands

Adjust motor oscillation and SetRadCol command

2014-07-03 12:12:52 +10: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

Merge from Wombat, except sics_config.ini

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

motors

Make sample stages configurable and add Oxford magnet sample stick motor as an option.

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