Merge commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13'

Browse Source

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

Conflicts:
	configure

See: eff2edae562096c1e21e8c048392ffe8968181f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-11-27 02:26:03 +01:00

parent 5b326f398e 4da3f410d1

commit 6f24566f56

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available