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 |
|
Ferdi Franceschini
|
7b6b11eef2
|
Let everyone have a magnet sample stick motor.
|
2014-08-06 10:08:12 +10:00 |
|
Ferdi Franceschini
|
8a6da09326
|
Deploy all environment control drivers.
|
2014-08-06 10:08:10 +10:00 |
|
Douglas Clowes
|
972e3232cd
|
Change the names in all of the files
|
2014-07-23 17:30:44 +10:00 |
|
Ferdi Franceschini
|
0ae4d40470
|
Deploy all environment drivers to all instruments.
|
2014-05-16 13:56:51 +10:00 |
|
Ferdi Franceschini
|
bea943ddf2
|
Add new reactor status object to instruments.
|
2014-03-25 09:23:57 +11:00 |
|
Ferdi Franceschini
|
e984619d77
|
Initial bilby configuration.
|
2014-01-15 16:31:14 +11:00 |
|