Merge commit '4da3f410d1'
* commit '4da3f410d1': configure: Restore doc option to disable building the documentation Conflicts: configure See:eff2edae56Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6f24566f56