Commit 6f24566f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4da3f410'

* commit '4da3f410':
  configure: Restore doc option to disable building the documentation

Conflicts:
	configure

See: eff2edaeMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5b326f39 4da3f410
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment