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

Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl

2015-01-07 13:09:27 +11:00

..

anticollider

Remove superfluous trailing white space from TCL files

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

beamline

Remove superfluous trailing white space from TCL files

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

chopper

SICS-770 Fixed SICS reports 'bad status code' when scanning the schp motor

2014-08-26 10:33:13 +10:00

commands

Remove superfluous trailing white space from TCL files

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

counter

Remove superfluous trailing white space from TCL files

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

hipadaba

add Pelican

2012-11-15 17:10:56 +11:00

hmm

Fix IP address of Pelican HV

2014-09-16 11:27:37 +10:00

motors

Adjustments to mtth/vwi/vei for Pelican

2014-12-15 15:33:05 +11:00

nexus

add Pelican

2012-11-15 17:10:56 +11:00

plc

Pelican does not currently have a PLC interface

2014-09-10 17:03:00 +10:00

scan

add Pelican

2012-11-15 17:10:56 +11:00

INSTCFCOMMON.TXT

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

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

Makefile

add Pelican

2012-11-15 17:10:56 +11:00