Douglas Clowes 9ee2252138 Merge branch 'RELEASE-3_1' into RELEASE-3_2 ...

Conflicts:
	sics/site_ansto/instrument/dingo/dingo_configuration.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl

2015-03-13 15:44:32 +11:00

..

anticollider

Remove superfluous trailing white space from TCL files

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

commands

Fix up whitespace.

2015-03-13 11:57:56 +11:00

counter

Allow selecting histogram memory server as source of beam monitor counts.

2015-02-06 08:48:11 +11: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

Copy changes from ics1-wombat

2015-03-13 11:54:50 +11:00

motors

Copy changes from ics1-wombat

2015-03-13 11:54:50 +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