Merge branch '3.0-rc' into developer

This commit is contained in:
Dhanya Maliakal 2017-08-17 17:13:40 +02:00
commit 8c0b4ac216
3 changed files with 5 additions and 3 deletions

2
.gitignore vendored
View File

@ -15,3 +15,5 @@ JCTBGui/
*.toc
build
tests
manual/slsDetectorClientDocs/latex/doxygen.sty
manual/slsDetectorClientDocs/latex/refman.tex

View File

@ -24,9 +24,9 @@
\fancyplain{}{\bfseries\thepage}%
}
\rfoot[\fancyplain{}{\bfseries\scriptsize%
Generated on Thu Aug 17 17:10:06 2017 by Doxygen }]{}
Generated on Thu Aug 17 17:12:14 2017 by Doxygen }]{}
\lfoot[]{\fancyplain{}{\bfseries\scriptsize%
Generated on Thu Aug 17 17:10:06 2017 by Doxygen }}
Generated on Thu Aug 17 17:12:14 2017 by Doxygen }}
\cfoot{}
%---------- Internal commands used in this style file ----------------

View File

@ -40,7 +40,7 @@
\vspace*{1cm}
{\large Generated by Doxygen 1.6.1}\\
\vspace*{0.5cm}
{\small Thu Aug 17 17:10:06 2017}\\
{\small Thu Aug 17 17:12:14 2017}\\
\end{center}
\end{titlepage}
\pagenumbering{roman}