Merge changes made in-situ.
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
This commit is contained in:
committed by
Douglas Clowes
parent
f494ece7e7
commit
b6ed01fc13
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.37 $
|
||||
# $Date: 2009-11-24 22:56:47 $
|
||||
# $Revision: 1.38 $
|
||||
# $Date: 2009-12-10 03:57:53 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@@ -46,8 +46,8 @@ source gumxml.tcl
|
||||
# ::environment::temperature::add_ls340t tc1 1
|
||||
# ::environment::temperature::add_ls340t tc2 2
|
||||
|
||||
# ::environment::temperature::add_west400
|
||||
::robot::add_robby
|
||||
# ::environment::temperature::add_west400 137.157.201.14
|
||||
::robot::add_robby
|
||||
server_init
|
||||
###########################################
|
||||
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
|
||||
|
||||
Reference in New Issue
Block a user