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

..

bilby

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

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

config

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

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

dingo

Merge branch 'RELEASE-3_1'

2014-11-06 14:13:20 +11:00

hipd

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

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

hrpd

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

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

kookaburra

Merge branch 'RELEASE-3_1'

2014-11-13 13:52:46 +11:00

lyrebird

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

2014-09-26 17:04:19 +10:00

pas

Let everyone have a magnet sample stick motor.

2014-08-06 10:08:12 +10:00

pelican

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

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

qld

Add sics_simulation.tcl to each instrument MANIFEST.TXT file

2014-09-10 10:14:46 +10:00

reflectometer

Merge branch 'RELEASE-3_1'

2014-11-06 14:13:20 +11:00

rsd

Merge branch 'RELEASE-3_1'

2014-11-06 14:13:20 +11:00

sans

Merge branch 'RELEASE-3_1'

2014-11-13 13:52:46 +11:00

tas

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

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

TEST_SICS

Add a new (configurable) fake Oxford Mercury

2014-11-20 14:49:54 +11:00

util

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

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

barebones.tcl

Remove superfluous trailing white space from TCL files

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

compareSICS.py

Formatting, typo, and speedup from RELEASE-3_2 compareSICS.py

2014-11-03 11:46:51 +11:00

deploySICS.sh

Strip the date and time from server_date_time in FILEMAP.TXT

2014-09-26 15:33:00 +10:00

gen_home_slits.tcl

Restored accidentally removed file.

2012-11-15 12:51:16 +11:00

genCLOSLOOP.tcl

Restored accidentally removed file.

2012-11-15 12:51:16 +11:00

gumxml.tcl

Implement hlistprop $path tclnames

2014-07-02 12:28:41 +10:00

MANIFEST.TXT

A new runsics script has been implemented in python (runsics.py).

2013-05-13 23:11:15 +10:00

mksim_config.tcl

Remove superfluous trailing white space from TCL files

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

runsics.py

Merge branch 'RELEASE-3_1'

2014-11-13 13:52:46 +11:00

server_config.tcl

SICS-780 Set attributes on environment control objects even if there are errors setting up other objects.

2014-09-19 12:16:30 +10:00