Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts: sics/site_ansto/instrument/hipd/wombat_configuration.tcl sics/site_ansto/instrument/hrpd/echidna_configuration.tcl sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl sics/site_ansto/instrument/tas/taipan_configuration.tcl
This commit is contained in:
@@ -24,7 +24,8 @@ set my_Home 8389613
|
||||
#set mx_Home 7580366
|
||||
set mx_Home 8392083
|
||||
#set mom_Home 13442930
|
||||
set mom_Home 8218065
|
||||
#set mom_Home 8218065
|
||||
set mom_Home 8295887
|
||||
set mtth_Home 11534660
|
||||
set pcx_Home 6330515
|
||||
set pcr_Home 21650101
|
||||
|
||||
Reference in New Issue
Block a user