Merge branch 'master' into maverick

- Removed epicsmotor from motor.c - Fixed a bad define in tasscanub.h Conflicts: makefile_macosx
2015-03-17 14:01:40 +01:00
parent bff0473ed6 0097a2f3cb
commit f82197623e
85 changed files with 2332 additions and 459 deletions
--- a/tasscanub.c
+++ b/tasscanub.c
@ -771,7 +771,6 @@ static int TASUBScanCount(pScanData self, int iPoint)
  } else {
    status = 1;
  }
-  SetStatus(eOld);

  return status;
 }