Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

This commit is contained in:
2015-02-04 09:28:09 +01:00
3 changed files with 21 additions and 18 deletions

View File

@ -1193,7 +1193,7 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) {
} else if (action==HELP_ACTION) {
return helpStatus(narg,args,HELP_ACTION);
}
runStatus s=myDet->getRunStatus();
runStatus s=myDet->getRunStatus();
return myDet->runStatusType(s);
}