Douglas Clowes 8b4ab411fd Merge branch 'Wombat' into temp ...

Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/hipd/config/commands/commands.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini

2015-02-19 15:26:13 +11:00

..

bilby

Regenerate SCT drivers

2014-12-02 10:09:17 +11:00

config

Merge branch 'Wombat' into temp

2015-02-19 15:26:13 +11:00

dingo

Clean up Dingo sics_config.ini

2014-10-17 16:42:54 +11:00

hipd

Merge branch 'Wombat' into temp

2015-02-19 15:26:13 +11:00

hrpd

Merge branch 'Echidna' into temp

2015-02-19 14:57:43 +11:00

kookaburra

Remove trailing spaces and blank lines from sct_bm.tcl

2015-01-08 11:41:09 +11:00

lyrebird

Add sics_simulation.tcl to each instrument MANIFEST.TXT file

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

pas

Let everyone have a magnet sample stick motor.

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

pelican

Merge branch 'Pelican' into temp

2015-02-19 14:53:33 +11:00

qld

SICS-151 Remove extraconfig.tcl from remaining MANIFEST.TXT files

2015-01-23 12:28:53 +11:00

reflectometer

Merge branch 'Platypus' into temp

2015-02-19 14:55:19 +11:00

rsd

SICS-151 Remove extraconfig.tcl from remaining MANIFEST.TXT files

2015-01-23 12:28:53 +11:00

sans

Merged changes from Quokka as at 2015-02-18

2015-02-19 09:40:49 +11:00

tas

Merge branch 'Taipan_R31' into temp

2015-02-19 14:50:39 +11:00

TEST_SICS

Fake device for Oxford LabView testing

2015-02-16 12:36:12 +11:00

util

Set the driver name and the ip_address/tcp_port for nosctcontroller

2014-11-27 15:15:13 +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

Fixed typo in the runsics script which prevents a 'kill -15' from executing.

2014-11-07 09:44:36 +11:00

server_config.tcl

Pullback from Taipan 2015-02-19

2015-02-19 10:34:12 +11:00