Douglas Clowes
|
0b2f3d520b
|
Regen SCT drivers
|
2014-11-06 13:36:47 +11:00 |
|
Douglas Clowes
|
e4b88fd2ad
|
Regen SCT drivers
|
2014-10-03 09:58:10 +10:00 |
|
Douglas Clowes
|
ba72e77d4c
|
Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
sics/site_ansto/instrument/bilby/util/sics_config.ini
sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl
sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
sics/site_ansto/instrument/config/environment/protekmm_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/west_6100.sct
sics/site_ansto/instrument/config/source/reactor_status_sct.tcl
sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
sics/site_ansto/instrument/sans/quokka_configuration.tcl
sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/util/gen_sct.py
sics/site_ansto/instrument/util/motor_utility.tcl
|
2014-09-26 17:04:19 +10:00 |
|
Douglas Clowes
|
44f6b65aef
|
Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
|
2014-08-19 11:46:24 +10:00 |
|
Douglas Clowes
|
507ddafb2a
|
Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/pelican/pelican_configuration.tcl
|
2014-08-06 13:53:18 +10:00 |
|
Douglas Clowes
|
972e3232cd
|
Change the names in all of the files
|
2014-07-23 17:30:44 +10:00 |
|
Douglas Clowes
|
9c90153f37
|
Perform the rename
|
2014-07-23 17:14:18 +10:00 |
|