linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,292 Commits 1 Branch 0 Tags
d83b346ef747aa15c99c9223e531b2d67f25b396
Commit Graph

3 Commits

Author SHA1 Message Date
Ferdi Franceschini
fd6a955d6b Remove keywords to simplify merging branches. 
r2859 | ffr | 2010-01-13 15:41:46 +1100 (Wed, 13 Jan 2010) | 2 lines
 2012-11-15 16:59:06 +11:00
Ferdi Franceschini
6c6156174f Manually merged the following changes from RELEASE-2_0P1 
commands_common.tcl
fixed counter feedback

anticollider_common.tcl
implement anticollider administrative override

reflectometer,sans/.../anticollider.tcl
implement administrative override to move detector

r2626 | ffr | 2008-06-12 12:55:28 +1000 (Thu, 12 Jun 2008) | 11 lines
 2012-11-15 13:39:18 +11:00
Ferdi Franceschini
0749b0effa Merging release 2.0 branch with CVS trunk 
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
 2012-11-15 13:38:17 +11:00