Merge branch '3.0-rc' into developer

This commit is contained in:
Dhanya Maliakal 2017-08-17 17:04:30 +02:00
commit 269227b093

View File

@ -1459,7 +1459,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
- <b>temp_10ge</b> Gets the 10Gbe temperature. Used in EIGER only. \c Returns \c EIGER(double"°C")
*/
descrToFuncMap[i].m_pFuncName="temp_10ge"; //
descrToFuncMap[i].m_pFuncPtr. \c Returns \c (int ["mV"])etectorCommand::cmdADC;
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
i++;
/*! \page settings