Ferdi Franceschini
|
d8f5030a8d
|
SICS-795 Bring GIT up to date with changes made on ics1-wombat.
|
2014-10-08 20:29:23 +11:00 |
|
Douglas Clowes
|
648c8003b7
|
Merge from Wombat, except sics_config.ini
Conflicts:
sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/config/hmm/hmm_object.tcl
sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/hipd/util/sics_config.ini
sics/site_ansto/instrument/server_config.tcl
|
2014-06-25 13:35:28 +10:00 |
|
Ferdi Franceschini
|
d2ac198251
|
Updates from ics1-wombat
|
2013-12-20 09:09:00 +11:00 |
|
Ferdi Franceschini
|
e6e3c3be52
|
Merged in-situ modifications for Release 2.5 candidate 5
r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
|
2012-11-15 17:00:43 +11:00 |
|
Ferdi Franceschini
|
c73c4c85c8
|
Merges from ics1-wombat
r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines
|
2012-11-15 16:57:39 +11:00 |
|
Ferdi Franceschini
|
0c69a21706
|
Incorporated in-situ modifications to Release 2.2
r2731 | ffr | 2008-11-03 19:59:56 +1100 (Mon, 03 Nov 2008) | 2 lines
|
2012-11-15 16:56:17 +11:00 |
|