aaa6c8a6ce
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help options from both sides. |
||
---|---|---|
.. | ||
static | ||
templates | ||
.gitignore | ||
CMakeLists.txt | ||
apply_qthelp_css_workaround.cmake | ||
cmake.py | ||
conf.py.in | ||
fixup_qthelp_names.cmake |