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
|
892ca1cdc5
|
Merge branch 'RELEASE-3_1'
|
2014-11-20 15:11:56 +11:00 |
|
Douglas Clowes
|
1469a60b5d
|
Regen SCT driver with new spacing
|
2014-11-20 14:51:54 +11:00 |
|
Douglas Clowes
|
a053c02868
|
Regenerate SCT drivers
|
2014-11-13 14:21:42 +11:00 |
|
Douglas Clowes
|
f076b537ed
|
Regenerate SCT drivers
|
2014-11-13 13:53:04 +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
|
42db9431f2
|
Add newer generated drivers from merge
|
2014-11-06 14:43:18 +11:00 |
|