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

2014-08-18 13:34:56 +10:00
parent c95d2d6885 288be8f1c2
commit 10b7e8029f
16 changed files with 470 additions and 190 deletions
--- a/site_ansto/instrument/sans/util/sics_config.ini
+++ b/site_ansto/instrument/sans/util/sics_config.ini
@@ -156,6 +156,7 @@ desc = "Load the ten position sample changer configuration"
 imptype = motion_axis

 [12tmagnet_oxford]
+asyncqueue = sct
 desc = "12 Tesla Oxford Magnet"
 driver = "oxford_labview"
 imptype = magnetic_field