Merge branch 'release' into jungfrauv1.0

This commit is contained in:
Dhanya Maliakal
2016-02-03 15:05:50 +01:00
9 changed files with 56 additions and 29 deletions

View File

@ -1113,7 +1113,7 @@ string slsDetectorCommand::helpLine(int narg, char *args[], int action) {
if (narg==0) {
os << "Command can be: " << endl;
for(int i=0; i<numberOfCommands; ++i) {
os << descrToFuncMap[i].m_pFuncName << "\t" ;
os << descrToFuncMap[i].m_pFuncName << "\n" ;
}
os << endl;
return os.str();