Merge remote-tracking branch 'origin/master'

f0f1224b · Federico Vaga · 2f029024 · 90f41f6a · f0f1224b · f0f1224b
Commit f0f1224b authored Oct 19, 2018 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

.gitignore doc/.gitignore +2 -1

requirements.txt doc/requirements.txt +4 -0

No files found.
--- a/doc/.gitignore
+++ b/doc/.gitignore
 doxygen-lib-output/
 *.log
-_build
\ No newline at end of file
+_build
+build_env
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
+docutils==0.12
+Sphinx==1.4.9
+sphinx_rtd_theme
+breathe==4.10.0