Douglas Clowes
|
4bb05ed67e
|
Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
|
2015-04-17 13:54:48 +10:00 |
|
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 |
|
Douglas Clowes
|
38dff05881
|
Regenerate SCT drivers
|
2014-11-13 12:38:03 +11:00 |
|
Douglas Clowes
|
3450b4cbf9
|
Regenerate SCT drivers
|
2014-11-13 12:35:46 +11:00 |
|
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
|
3650e68f9a
|
Regenerate template drivers
|
2014-08-19 12:04:53 +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 |
|