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

re-produce package for Dingo

2012-11-15 17:30:25 +11:00

counter

Pull back changes from Dingo

2014-07-09 15:01:21 +10:00

hipadaba

re-produce package for Dingo

2012-11-15 17:30:25 +11:00

hmm

Provide dummy histogram initialisation function.

2013-06-14 09:42:57 +10:00

motors

Merge changes from Dingo 2014-09-09

2014-09-09 16:38:44 +10:00

nexus

re-produce package for Dingo

2012-11-15 17:30:25 +11:00

plc

SICS-796: Bring GIT up to date with changes made on ics1-dingo.

2014-10-08 20:46:16 +11:00

scan

We need dingo.hdd for the scan command. NOTE SICS crashes without it, see SICS-763

2014-08-01 11:35:09 +10:00

INSTCFCOMMON.TXT

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

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

Makefile

re-produce package for Dingo

2012-11-15 17:30:25 +11:00