Merge commit '523506668a61646603ed299e1b60b7f77a8ebd77'

diff --cc m.css/.editorconfig
Simple merge

diff --cc m.css/CONTRIBUTING.rst
Simple merge

diff --cc m.css/CREDITS.rst
Simple merge

diff --cc m.css/README.rst
Simple merge

diff --cc m.css/css/m-components.css
Simple merge

diff --cc m.css/css/m-dark+documentation.compiled.css
Simple merge

diff --cc m.css/css/m-dark.compiled.css
Simple merge

diff --cc m.css/css/m-dark.css
Simple merge

diff --cc m.css/css/m-dark.documentation.compiled.css
Simple merge

diff --cc m.css/css/m-debug.css
Simple merge

diff --cc m.css/css/m-documentation.css
Simple merge

diff --cc m.css/css/m-grid.css
Simple merge

diff --cc m.css/css/m-layout.css
Simple merge

diff --cc m.css/css/m-light+documentation.compiled.css
Simple merge

diff --cc m.css/css/m-light.compiled.css
Simple merge

diff --cc m.css/css/m-light.css
Simple merge

diff --cc m.css/css/m-light.documentation.compiled.css
Simple merge

diff --cc m.css/css/m-theme-dark.css
Simple merge

diff --cc m.css/css/m-theme-light.css
Simple merge

diff --cc m.css/css/postprocess.py
Simple merge

diff --cc m.css/css/pygments-console.css
Simple merge

diff --cc m.css/css/pygments-console.py
Simple merge

diff --cc m.css/css/pygments-dark.py
Simple merge

diff --cc m.css/doc/admire/math.rst
Simple merge

diff --cc m.css/doc/build-status.html.in
Simple merge

diff --cc m.css/doc/css.rst
Simple merge

diff --cc m.css/doc/css/components-test.rst
Simple merge

diff --cc m.css/doc/css/components.rst
Simple merge

diff --cc m.css/doc/css/grid-test.rst
Simple merge

diff --cc m.css/doc/css/grid.rst
Simple merge

diff --cc m.css/doc/css/page-layout-test-navbar-brand-logo.html
Simple merge

diff --cc m.css/doc/css/page-layout-test-navbar-subsite.html
Simple merge

diff --cc m.css/doc/css/page-layout-test.rst
Simple merge

diff --cc m.css/doc/css/page-layout.rst
Simple merge

diff --cc m.css/doc/css/themes.rst
Simple merge

diff --cc m.css/doc/css/typography-test.rst
Simple merge

diff --cc m.css/doc/css/typography.rst
Simple merge

diff --cc m.css/doc/documentation.rst
Simple merge

diff --cc m.css/doc/documentation/corrade.tag
Simple merge

diff --cc m.css/doc/documentation/doxygen-test.rst
Simple merge

diff --cc m.css/doc/documentation/doxygen.rst
Simple merge

diff --cc m.css/doc/documentation/python.rst
Simple merge

diff --cc m.css/doc/examples/article-hide-summary.rst
Simple merge

diff --cc m.css/doc/examples/article.rst
Simple merge

diff --cc m.css/doc/examples/jumbo-article-hide-summary.rst
Simple merge

diff --cc m.css/doc/examples/jumbo-article.rst
Simple merge

diff --cc m.css/doc/index.rst
Simple merge

diff --cc m.css/doc/plugins.rst
Simple merge

diff --cc m.css/doc/plugins/components-test.rst
Simple merge

diff --cc m.css/doc/plugins/components.rst
Simple merge

diff --cc m.css/doc/plugins/htmlsanity.rst
Simple merge

diff --cc m.css/doc/plugins/images-test.rst
Simple merge

diff --cc m.css/doc/plugins/images.rst
Simple merge

diff --cc m.css/doc/plugins/links.rst
Simple merge

diff --cc m.css/doc/plugins/math-and-code-test.rst
Simple merge

diff --cc m.css/doc/plugins/math-and-code.rst
Simple merge

diff --cc m.css/doc/plugins/metadata.rst
Simple merge

diff --cc m.css/doc/plugins/plots-and-graphs-test.rst
Simple merge

diff --cc m.css/doc/plugins/plots-and-graphs.rst
Simple merge

diff --cc m.css/doc/plugins/sphinx.rst
Simple merge

diff --cc m.css/doc/themes.rst
Simple merge

diff --cc m.css/doc/themes/pelican.rst
Simple merge

diff --cc m.css/doc/themes/writing-rst-content.rst
Simple merge

diff --cc m.css/doc/why.rst
Simple merge

diff --cc m.css/documentation/__init__.py
Simple merge

diff --cc m.css/documentation/_search.py
Simple merge

diff --cc m.css/documentation/doxygen.py
Simple merge

diff --cc m.css/documentation/python.py
Simple merge

diff --cc m.css/documentation/search.js
Simple merge

diff --cc m.css/documentation/templates/doxygen/base-class-reference.html
Simple merge

diff --cc m.css/documentation/templates/doxygen/base-reference.html
Simple merge

diff --cc m.css/documentation/templates/doxygen/base.html
Simple merge

diff --cc m.css/documentation/templates/doxygen/details-func.html
Simple merge

diff --cc m.css/documentation/templates/doxygen/entry-func.html
Simple merge

diff --cc m.css/documentation/templates/doxygen/page.html
Simple merge

diff --cc m.css/documentation/templates/python/base.html
Simple merge

diff --cc m.css/documentation/templates/python/class.html
Simple merge

diff --cc m.css/documentation/templates/python/module.html
Simple merge

diff --cc m.css/documentation/test/__init__.py
Simple merge

diff --cc m.css/documentation/test/_search_test_metadata.py
Simple merge

diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri2-fo3.bin
index 0000000000000000000000000000000000000000,d13e176c93508907b4566d3f386cda686e22f25b..d13e176c93508907b4566d3f386cda686e22f25b
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri2-fo4.bin
index 0000000000000000000000000000000000000000,3803349e0fed4e57d7f5dcf587f17eaad4282772..3803349e0fed4e57d7f5dcf587f17eaad4282772
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri3-fo3.bin
index 0000000000000000000000000000000000000000,4d98643ae5e8c57b89e1d1123a14dd0e706122b8..4d98643ae5e8c57b89e1d1123a14dd0e706122b8
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri3-fo4.bin
index 0000000000000000000000000000000000000000,8b484e181b35ea031be7b3201b4541cdea912ae2..8b484e181b35ea031be7b3201b4541cdea912ae2
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri4-fo3.bin
index 0000000000000000000000000000000000000000,abbc4d41f05e2bf81142f62b47dee7d30d58caff..abbc4d41f05e2bf81142f62b47dee7d30d58caff
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns1-ri4-fo4.bin
index 0000000000000000000000000000000000000000,4fbe1f527ca27d28ab46ddc03ec4123a63212ca0..4fbe1f527ca27d28ab46ddc03ec4123a63212ca0
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri2-fo3.bin
index 0000000000000000000000000000000000000000,f856f5b436f3bdd872a43d0e6ab13046c6fa78db..f856f5b436f3bdd872a43d0e6ab13046c6fa78db
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri2-fo4.bin
index 0000000000000000000000000000000000000000,cd7ce16ecd0a8d0c7831f41c7d3ce4f8fe30d4ac..cd7ce16ecd0a8d0c7831f41c7d3ce4f8fe30d4ac
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri3-fo3.bin
index 0000000000000000000000000000000000000000,81f31146adc9e231c5ebf0f87a40faf2e0dff2f2..81f31146adc9e231c5ebf0f87a40faf2e0dff2f2
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri3-fo4.bin
index 0000000000000000000000000000000000000000,ef2ee6500d271d84100529e6a903adab587dba79..ef2ee6500d271d84100529e6a903adab587dba79
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri4-fo3.bin
index 0000000000000000000000000000000000000000,9f94c887e402c7dee2df5438b166759bd0ebc27b..9f94c887e402c7dee2df5438b166759bd0ebc27b
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/empty-ns2-ri4-fo4.bin
index 0000000000000000000000000000000000000000,90c4aa8dbcfce188efa88f9219cc168d45fdb835..90c4aa8dbcfce188efa88f9219cc168d45fdb835
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri2-fo3.bin
index 0000000000000000000000000000000000000000,23e1735bce4159254ae391b1206b8eb85118e6c2..23e1735bce4159254ae391b1206b8eb85118e6c2
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri2-fo4.bin
index 0000000000000000000000000000000000000000,ea42fbcf019168982010b96c3a179bdf0c839d0d..ea42fbcf019168982010b96c3a179bdf0c839d0d
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri3-fo3.bin
index 0000000000000000000000000000000000000000,52c1637f246a71f86d5a9f94e72132c8d28d88f2..52c1637f246a71f86d5a9f94e72132c8d28d88f2
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri3-fo4.bin
index 0000000000000000000000000000000000000000,56dfd9e6d9ba47985c888d287824fe93effbd4c4..56dfd9e6d9ba47985c888d287824fe93effbd4c4
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri4-fo3.bin
index 0000000000000000000000000000000000000000,c8d6c8bd5cfa7cbb3998cd9ea6d0eb582e51cb22..c8d6c8bd5cfa7cbb3998cd9ea6d0eb582e51cb22
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns1-ri4-fo4.bin
index 0000000000000000000000000000000000000000,6b1c4941afbf6c740ecf925dcca10f1fb1693e4e..6b1c4941afbf6c740ecf925dcca10f1fb1693e4e
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri2-fo3.bin
index 0000000000000000000000000000000000000000,62ecdcde095240f8da7cb38c08577763de601fd6..62ecdcde095240f8da7cb38c08577763de601fd6
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri2-fo4.bin
index 0000000000000000000000000000000000000000,858d45663c6dd2a716246ae4964843daa90138ad..858d45663c6dd2a716246ae4964843daa90138ad
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri3-fo3.bin
index 0000000000000000000000000000000000000000,4e3f2840dcdd15bad44f16a8b4770f26457e77d9..4e3f2840dcdd15bad44f16a8b4770f26457e77d9
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri3-fo4.bin
index 0000000000000000000000000000000000000000,c280a6daa199da2b4baa9838c25ff085affbe6ff..c280a6daa199da2b4baa9838c25ff085affbe6ff
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri4-fo3.bin
index 0000000000000000000000000000000000000000,9b295b7abb8419592c0b109785c34a560ebb7c9d..9b295b7abb8419592c0b109785c34a560ebb7c9d
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/manyresults-ns2-ri4-fo4.bin
index 0000000000000000000000000000000000000000,8097294ab4baeac46e5384a206be4eebf6c07907..8097294ab4baeac46e5384a206be4eebf6c07907
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/nested.bin
index 6a92cb9c3e9ee70e07dc536fc613d6ac4df0dfef,7079b87b01e8eade5403efaa98aa1405300b6b71..7079b87b01e8eade5403efaa98aa1405300b6b71
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo3.b85
index 0000000000000000000000000000000000000000,c49bb8cc16b72b6e922b0a84cdaadefd55aa6873..c49bb8cc16b72b6e922b0a84cdaadefd55aa6873
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test/js-test-data/searchdata-ns1-ri2-fo3.b85
+++ b/m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo3.b85

diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo3.bin
index 0000000000000000000000000000000000000000,1274c391d8c41345fd248de59ba730149d19cf6d..1274c391d8c41345fd248de59ba730149d19cf6d
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri2-fo4.bin
index 0000000000000000000000000000000000000000,9b67dce2d025c924a9656080d64558ed9a14e9c9..9b67dce2d025c924a9656080d64558ed9a14e9c9
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri3-fo3.bin
index 0000000000000000000000000000000000000000,c7dd8dbd54d8a79ffdb917757463bd8a0113f5a6..c7dd8dbd54d8a79ffdb917757463bd8a0113f5a6
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri3-fo4.bin
index 0000000000000000000000000000000000000000,189938577f181318a1919d54f271d1af0b3ca87f..189938577f181318a1919d54f271d1af0b3ca87f
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri4-fo3.bin
index 0000000000000000000000000000000000000000,6b91fb41aff6eb9aaed341c55a5b481c61b2619d..6b91fb41aff6eb9aaed341c55a5b481c61b2619d
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns1-ri4-fo4.bin
index 0000000000000000000000000000000000000000,8e5acd73f39364d62de0b0eefc6183febb11650a..8e5acd73f39364d62de0b0eefc6183febb11650a
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri2-fo3.bin
index 0000000000000000000000000000000000000000,9d4a372c578c3a90bb6ab94d4f18f13c360eaaa3..9d4a372c578c3a90bb6ab94d4f18f13c360eaaa3
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri2-fo4.bin
index 0000000000000000000000000000000000000000,a48977fbc3a5f477f933fcf8e08d52acce38c4fb..a48977fbc3a5f477f933fcf8e08d52acce38c4fb
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri3-fo3.bin
index 0000000000000000000000000000000000000000,c30d3d9aff0aaf8831c4e8bd11f944fedb2694e7..c30d3d9aff0aaf8831c4e8bd11f944fedb2694e7
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri3-fo4.bin
index 0000000000000000000000000000000000000000,eec2ab15523480cae925383110358fa6611ed231..eec2ab15523480cae925383110358fa6611ed231
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri4-fo3.bin
index 0000000000000000000000000000000000000000,c53ec70e660254f249ddbc96f8cb90684b12858e..c53ec70e660254f249ddbc96f8cb90684b12858e
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/searchdata-ns2-ri4-fo4.bin
index 0000000000000000000000000000000000000000,16b08a6db0feff5c7bb83149bafd90c97e4738bb..16b08a6db0feff5c7bb83149bafd90c97e4738bb
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/short.bin
Simple merge

diff --cc m.css/documentation/test/js-test-data/unicode.bin
index 132cec998a3484675fc17a0353b3b7f784e3dbca,d72ae17f51a1c12e86d2e9a86c34e5fa5e5e506c..d72ae17f51a1c12e86d2e9a86c34e5fa5e5e506c
Binary files differ

diff --cc m.css/documentation/test/js-test-data/wrong-magic.bin
index 6a3dd03eb7cd398f2b0b43a2b7234fd00cff1f77,3e3670235969810fa1e52e6dd3cd52d51bb9d834..3e3670235969810fa1e52e6dd3cd52d51bb9d834
Binary files differ

diff --cc m.css/documentation/test/js-test-data/wrong-result-id-bytes.bin
index 0000000000000000000000000000000000000000,3e99537d09ae8ec6a5819640f1b7d56febf51a37..3e99537d09ae8ec6a5819640f1b7d56febf51a37
mode 000000,100644..100644
Binary files differ

diff --cc m.css/documentation/test/js-test-data/wrong-version.bin
index 9b66517fd264a88dd8c3adcc63b62610134239ee,f555f700e8fbf8b8c5aa78f0a619c7126f5080df..f555f700e8fbf8b8c5aa78f0a619c7126f5080df
Binary files differ

diff --cc m.css/documentation/test/populate-js-test-data.py
Simple merge

diff --cc m.css/documentation/test/test-search.js
Simple merge

diff --cc m.css/documentation/test/test_search.py
Simple merge

diff --cc m.css/documentation/test_doxygen/__init__.py
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_crazy_template_params/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_deprecated/DeprecatedFile_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_deprecated/dir_da5033def2d0db76e9883b31b76b3d0c.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_deprecated/group__group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_deprecated/namespaceDeprecatedNamespace.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_detailed/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_detailed/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_detailed/namespaceFoo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_detailed/namespaceType.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_detailed/namespaceVar.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_detailed/namespaceWarning.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_detailed/structTemplate.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_detailed/structTemplate_3_01void_01_4.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_exception_reference/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_filename_case/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_filename_case/input.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_filename_case/page.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_filename_case/pages.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/classClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/group__group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/namespaceContained.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/namespaceContainsNamespace.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/namespaceContainsNamespace_1_1ContainsClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/namespaceSpread.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes/structSpreadClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/classClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/group__group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/namespaceContained.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/namespaceSpread.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_disabled/structSpreadClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_includes_templated/namespaceSpread.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_inline_namespace/namespaceFoo_1_1Bar.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/Class_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/Directory/Sub/Class.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/annotated.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/classRoot_1_1Directory_1_1Sub_1_1Class.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/dir_4b0d5f8864bf89936129251a2d32609b.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/dir_bbe5918fe090eee9db2d9952314b6754.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/namespaceRoot_1_1Directory.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_listing/structRoot_1_1Directory_1_1Sub_1_1Warning.html
index 0000000000000000000000000000000000000000,846e3da57e98cc73c944a418e2db48d91214ad21..846e3da57e98cc73c944a418e2db48d91214ad21
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_listing/structRoot_1_1Directory_1_1Sub_1_1Warning.html
+++ b/m.css/documentation/test_doxygen/compound_listing/structRoot_1_1Directory_1_1Sub_1_1Warning.html

diff --cc m.css/documentation/test_doxygen/compound_modules/group__group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_modules/group__group2.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_modules/group__subgroup.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_modules_in_namespace/file3_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_modules_in_namespace/group__group1.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_modules_in_namespace/group__group2.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_modules_in_namespace/namespaceNamespace.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_namespace_members_in_file_scope/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_namespace_members_in_file_scope/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_namespace_members_in_file_scope/namespaceNamespace.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_namespace_members_in_file_scope_define_base_url/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_since/Class_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_since/DeprecatedClass_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_since/dir_4b0d5f8864bf89936129251a2d32609b.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_since/dir_73d1500434dee6f1c83b12ee799c54af.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_since/group__deprecated-group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_since/group__group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_since/namespaceDeprecatedFoo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/compound_since/namespaceFoo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_anchor_in_both_group_and_namespace/group__fizzbuzz.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_anchor_in_both_group_and_namespace/namespaceFoo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_autobrief_blockquote/Doxyfile
index 0000000000000000000000000000000000000000,bf3f5a3051aec344c8f2f4cdfd0f6226f3e03b1a..bf3f5a3051aec344c8f2f4cdfd0f6226f3e03b1a
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_autobrief_blockquote/Doxyfile
+++ b/m.css/documentation/test_doxygen/contents_autobrief_blockquote/Doxyfile

diff --cc m.css/documentation/test_doxygen/contents_autobrief_blockquote/File.h
index 0000000000000000000000000000000000000000,ab5607e704fca5af0aa4ae49d1ced5af7ab6a8fe..ab5607e704fca5af0aa4ae49d1ced5af7ab6a8fe
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_autobrief_blockquote/File.h
+++ b/m.css/documentation/test_doxygen/contents_autobrief_blockquote/File.h

diff --cc m.css/documentation/test_doxygen/contents_autobrief_blockquote/File_8h.html
index 0000000000000000000000000000000000000000,65d2e34e39102617321bf6f51bb9e89a7ce440c2..65d2e34e39102617321bf6f51bb9e89a7ce440c2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_autobrief_blockquote/File_8h.html
+++ b/m.css/documentation/test_doxygen/contents_autobrief_blockquote/File_8h.html

diff --cc m.css/documentation/test_doxygen/contents_autobrief_cpp_comments/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_autobrief_cpp_comments/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_autobrief_heading/namespaceNamespace.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_autobrief_heading/namespaceNamespace_1814.html
index 0000000000000000000000000000000000000000,b8734d1f8d22899a240b623e263aba0df7ba75b2..b8734d1f8d22899a240b623e263aba0df7ba75b2
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_autobrief_heading/namespaceNamespace_1814.html
+++ b/m.css/documentation/test_doxygen/contents_autobrief_heading/namespaceNamespace_1814.html

diff --cc m.css/documentation/test_doxygen/contents_autobrief_hr/namespaceNamespace.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_autobrief_hr/namespaceNamespace_1814.html
index 0000000000000000000000000000000000000000,75ca144bd62b09e66f938d1a2bd3250531f507a4..75ca144bd62b09e66f938d1a2bd3250531f507a4
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_autobrief_hr/namespaceNamespace_1814.html
+++ b/m.css/documentation/test_doxygen/contents_autobrief_hr/namespaceNamespace_1814.html

diff --cc m.css/documentation/test_doxygen/contents_autobrief_multiline/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_blockquote/Doxyfile
index 0000000000000000000000000000000000000000,0797976696ba66ac16681c986436899031413c6a..0797976696ba66ac16681c986436899031413c6a
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_blockquote/Doxyfile
+++ b/m.css/documentation/test_doxygen/contents_blockquote/Doxyfile

diff --cc m.css/documentation/test_doxygen/contents_blockquote/index.html
index 0000000000000000000000000000000000000000,350ff819c53ffc60f655b4ad34e205ec58797daf..350ff819c53ffc60f655b4ad34e205ec58797daf
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_blockquote/index.html
+++ b/m.css/documentation/test_doxygen/contents_blockquote/index.html

diff --cc m.css/documentation/test_doxygen/contents_blockquote/input.dox
index 0000000000000000000000000000000000000000,e22ba418806c21e7aa82ed5d2905e55d2b4ff5a6..e22ba418806c21e7aa82ed5d2905e55d2b4ff5a6
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_blockquote/input.dox
+++ b/m.css/documentation/test_doxygen/contents_blockquote/input.dox

diff --cc m.css/documentation/test_doxygen/contents_blocks/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_blocks/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_blocks/old_1818.html
index 0000000000000000000000000000000000000000,acb3c1c03023e4207a8ffc4e514acc39028b1d37..acb3c1c03023e4207a8ffc4e514acc39028b1d37
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_blocks/old_1818.html
+++ b/m.css/documentation/test_doxygen/contents_blocks/old_1818.html

diff --cc m.css/documentation/test_doxygen/contents_blocks/todo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_blocks/todo_1814.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/Doxyfile
index 0000000000000000000000000000000000000000,7e9ad9227d060d7068bb8d3eb2a918abdc154281..7e9ad9227d060d7068bb8d3eb2a918abdc154281
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_base_template_classes/Doxyfile
+++ b/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/Doxyfile

diff --cc m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/File.h
index 0000000000000000000000000000000000000000,deb92f4bc464c23df15fa85bc3f6c6d932d85f71..deb92f4bc464c23df15fa85bc3f6c6d932d85f71
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_brief_multiline_ingroup/File.h
+++ b/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/File.h

diff --cc m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup.html
index 0000000000000000000000000000000000000000,cf0a91e186bd2ac4c0576e107a41aa71fa125d80..cf0a91e186bd2ac4c0576e107a41aa71fa125d80
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup.html
+++ b/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup.html

diff --cc m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup_1815.html
index 0000000000000000000000000000000000000000,13e9cf2a60e432b5f16d0431493acae545bac2aa..13e9cf2a60e432b5f16d0431493acae545bac2aa
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup_1815.html
+++ b/m.css/documentation/test_doxygen/contents_brief_multiline_ingroup/group__thatgroup_1815.html

diff --cc m.css/documentation/test_doxygen/contents_code/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_code_language/ansi.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_code_language/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_custom/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_custom/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_custom/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_dot/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_dot/warnings_1815.html
index 0000000000000000000000000000000000000000,56bb62229abd1794063e8e7f9b6a9afd3ac331d3..56bb62229abd1794063e8e7f9b6a9afd3ac331d3
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_dot/warnings_1815.html
+++ b/m.css/documentation/test_doxygen/contents_dot/warnings_1815.html

diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/file.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/html-only.html
index 0000000000000000000000000000000000000000,eda570c55651c6c62f8ef92d96ff9e8c60ca7f07..eda570c55651c6c62f8ef92d96ff9e8c60ca7f07
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_htmlonly_htmlinclude/html-only.html
+++ b/m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/html-only.html

diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox
index 0000000000000000000000000000000000000000,e6636970bcbbb76c0df7e12bdbe68dad3262df25..e6636970bcbbb76c0df7e12bdbe68dad3262df25
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox
+++ b/m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox

diff --cc m.css/documentation/test_doxygen/contents_htmlonly_htmlinclude/warnings.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/Warnings.h
index 0000000000000000000000000000000000000000,ce4a8a81563c58ff25858cf1e623c4ee9f08cd48..ce4a8a81563c58ff25858cf1e623c4ee9f08cd48
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_sections_headings/Warnings.h
+++ b/m.css/documentation/test_doxygen/contents_sections_headings/Warnings.h

diff --cc m.css/documentation/test_doxygen/contents_sections_headings/Warnings_8h.html
index 0000000000000000000000000000000000000000,51c0aef4a5d263d7fa07f79138ac1aafe88ea6b9..51c0aef4a5d263d7fa07f79138ac1aafe88ea6b9
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_sections_headings/Warnings_8h.html
+++ b/m.css/documentation/test_doxygen/contents_sections_headings/Warnings_8h.html

diff --cc m.css/documentation/test_doxygen/contents_tagfile/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_tagfile/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_typography/doxygen1817.html
index 0000000000000000000000000000000000000000,44de00207a2dce609a087f4f772c1596af700d96..44de00207a2dce609a087f4f772c1596af700d96
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/contents_typography/doxygen1817.html
+++ b/m.css/documentation/test_doxygen/contents_typography/doxygen1817.html

diff --cc m.css/documentation/test_doxygen/contents_typography/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_typography/input.dox
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_unexpected_sections/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/contents_unexpected_sections/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_friends/File.h
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_friends/classClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_friends/classTemplate.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_friends/structWarning.html
index 0000000000000000000000000000000000000000,c28c927e943cafe41ab60340b137e92e41e55ab5..c28c927e943cafe41ab60340b137e92e41e55ab5
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/cpp_friends/structWarning.html
+++ b/m.css/documentation/test_doxygen/cpp_friends/structWarning.html

diff --cc m.css/documentation/test_doxygen/cpp_function_attributes/classBase.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_attributes/classDerived.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_attributes/input.h
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_attributes/structFinal.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_attributes/structFoo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_function_attributes_nospace/structFoo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_mishandled_macro_call/Doxyfile
index 0000000000000000000000000000000000000000,7e7e2cebd41ff09a188c38c03b4e4de76aebbcaf..7e7e2cebd41ff09a188c38c03b4e4de76aebbcaf
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/compound_detailed/Doxyfile
+++ b/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/Doxyfile

diff --cc m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File.h
index 0000000000000000000000000000000000000000,1700633cdd724dd4592f1da065bec08ad60e6fd9..1700633cdd724dd4592f1da065bec08ad60e6fd9
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/cpp_mishandled_macro_call/File.h
+++ b/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File.h

diff --cc m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File_8h.html
index 0000000000000000000000000000000000000000,3e27ba5ce88baed603a2725dba41b2f7b825d000..3e27ba5ce88baed603a2725dba41b2f7b825d000
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/cpp_mishandled_macro_call/File_8h.html
+++ b/m.css/documentation/test_doxygen/cpp_mishandled_macro_call/File_8h.html

diff --cc m.css/documentation/test_doxygen/cpp_signals_slots/classClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_template_alias/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_template_alias/structTemplate.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_variable_template/structBar.html
Simple merge

diff --cc m.css/documentation/test_doxygen/cpp_variable_template/structFoo.html
Simple merge

diff --cc m.css/documentation/test_doxygen/ignored_xmls/Doxyfile
index 0000000000000000000000000000000000000000,da7ab9e89fe47daac5288a066041d76e83f19c68..da7ab9e89fe47daac5288a066041d76e83f19c68
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_xmls/Doxyfile
+++ b/m.css/documentation/test_doxygen/ignored_xmls/Doxyfile

diff --cc m.css/documentation/test_doxygen/ignored_xmls/Doxyfile.xml
index 0000000000000000000000000000000000000000,b44092d829e688105dbf6e7e155456fb4e56c2a6..b44092d829e688105dbf6e7e155456fb4e56c2a6
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_xmls/Doxyfile.xml
+++ b/m.css/documentation/test_doxygen/ignored_xmls/Doxyfile.xml

diff --cc m.css/documentation/test_doxygen/ignored_xmls/Foxydile.xml
index 0000000000000000000000000000000000000000,a681f3251d537848cbe843f3153e0d60335e49d0..a681f3251d537848cbe843f3153e0d60335e49d0
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_xmls/Foxydile.xml
+++ b/m.css/documentation/test_doxygen/ignored_xmls/Foxydile.xml

diff --cc m.css/documentation/test_doxygen/ignored_xmls/broken.xml
index 0000000000000000000000000000000000000000,87476671ad5a89ca185a0df642dad609f42ff1c3..87476671ad5a89ca185a0df642dad609f42ff1c3
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_xmls/broken.xml
+++ b/m.css/documentation/test_doxygen/ignored_xmls/broken.xml

diff --cc m.css/documentation/test_doxygen/ignored_xmls/index.xml
index 0000000000000000000000000000000000000000,98fb054a26fb94bc95c5d699741bf85be3c96e9d..98fb054a26fb94bc95c5d699741bf85be3c96e9d
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_xmls/index.xml
+++ b/m.css/documentation/test_doxygen/ignored_xmls/index.xml

diff --cc m.css/documentation/test_doxygen/ignored_xmls/pages.html
index 0000000000000000000000000000000000000000,b75eb47b563ae857a72146f8ec341cd9eecb4cc1..b75eb47b563ae857a72146f8ec341cd9eecb4cc1
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_xmls/pages.html
+++ b/m.css/documentation/test_doxygen/ignored_xmls/pages.html

diff --cc m.css/documentation/test_doxygen/ignored_xmls/thingsgotcrazy.xml
index 0000000000000000000000000000000000000000,bbb19abd77e263ad29f384f83fe06c94c0ccce32..bbb19abd77e263ad29f384f83fe06c94c0ccce32
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/ignored_xmls/thingsgotcrazy.xml
+++ b/m.css/documentation/test_doxygen/ignored_xmls/thingsgotcrazy.xml

diff --cc m.css/documentation/test_doxygen/layout/pages.html
Simple merge

diff --cc m.css/documentation/test_doxygen/layout_generated_doxyfile/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/layout_minimal/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/layout_search_binary/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/layout_search_opensearch/index.html
Simple merge

diff --cc m.css/documentation/test_doxygen/page_toc/page-toc.html
Simple merge

diff --cc m.css/documentation/test_doxygen/search/Doxyfile
Simple merge

diff --cc m.css/documentation/test_doxygen/test_compound.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_contents.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_cpp.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_doxyfile.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_example.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_ignored_xmls.py
index 0000000000000000000000000000000000000000,4a7d4cec7b47fb5fbfa3db11cb86f81286612a06..4a7d4cec7b47fb5fbfa3db11cb86f81286612a06
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_doxygen/test_ignored_xmls.py
+++ b/m.css/documentation/test_doxygen/test_ignored_xmls.py

diff --cc m.css/documentation/test_doxygen/test_layout.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_page.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_search.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_undocumented.py
Simple merge

diff --cc m.css/documentation/test_doxygen/test_utility.py
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/File_8h.html
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/annotated.html
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/classClass.html
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/dir_4b0d5f8864bf89936129251a2d32609b.html
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/files.html
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/group__group.html
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/namespaceNamespace.html
Simple merge

diff --cc m.css/documentation/test_doxygen/undocumented/structNamespace_1_1ClassInANamespace.html
Simple merge

diff --cc m.css/documentation/test_python/CMakeLists.txt
Simple merge

diff --cc m.css/documentation/test_python/__init__.py
Simple merge

diff --cc m.css/documentation/test_python/content/content.Class.html
Simple merge

diff --cc m.css/documentation/test_python/content/content.ClassDocumentingItsMembers.html
Simple merge

diff --cc m.css/documentation/test_python/content/content.ClassWithSlots.html
Simple merge

diff --cc m.css/documentation/test_python/content/content.html
Simple merge

diff --cc m.css/documentation/test_python/content/content/__init__.py
Simple merge

diff --cc m.css/documentation/test_python/content_parse_docstrings/content_parse_docstrings.Class.html
Simple merge

diff --cc m.css/documentation/test_python/content_parse_docstrings/content_parse_docstrings.html
Simple merge

diff --cc m.css/documentation/test_python/content_parse_docstrings/content_parse_docstrings.py
Simple merge

diff --cc m.css/documentation/test_python/inspect_all_property/inspect_all_property.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations-py37+38.html
index 0000000000000000000000000000000000000000,c47f8b8645e5c8fccfa27e02895d99e3af45c096..c47f8b8645e5c8fccfa27e02895d99e3af45c096
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_annotations/inspect_annotations-py37+38.html
+++ b/m.css/documentation/test_python/inspect_annotations/inspect_annotations-py37+38.html

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.AContainer-py36-38.html
index 0000000000000000000000000000000000000000,9aa98a55233254e70be0e6db61df4bcd54375cef..9aa98a55233254e70be0e6db61df4bcd54375cef
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_annotations/inspect_annotations.AContainer-py36-38.html
+++ b/m.css/documentation/test_python/inspect_annotations/inspect_annotations.AContainer-py36-38.html

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.AContainer.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.FooSlots.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/inspect_annotations.py
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/math.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/math36.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_annotations/math373.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MyClass.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MyClassAutoAttribs-attrs193.html
index 0000000000000000000000000000000000000000,9739d2bbd0e20b214ac3027cfa7a5f0ed7d18d81..9739d2bbd0e20b214ac3027cfa7a5f0ed7d18d81
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_attrs/inspect_attrs.MyClassAutoAttribs-attrs193.html
+++ b/m.css/documentation/test_python/inspect_attrs/inspect_attrs.MyClassAutoAttribs-attrs193.html

diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MyClassAutoAttribs.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass-attrs193.html
index 0000000000000000000000000000000000000000,5056f3d84ee9ab45c5fef0ed66f28d39cf0475eb..5056f3d84ee9ab45c5fef0ed66f28d39cf0475eb
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass-attrs193.html
+++ b/m.css/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass-attrs193.html

diff --cc m.css/documentation/test_python/inspect_attrs/inspect_attrs.MySlotClass.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_duplicate_class/inspect_duplicate_class.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_duplicate_class/inspect_duplicate_class.sub.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_duplicate_class/inspect_duplicate_class/__init__.py
Simple merge

diff --cc m.css/documentation/test_python/inspect_name_mapping/inspect_name_mapping.Class.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_name_mapping/inspect_name_mapping.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_name_mapping/inspect_name_mapping.submodule.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_recursive/inspect_recursive.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.DerivedException.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.FooSlots.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.Specials.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_string/inspect_string.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.first.Foo.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.first.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.first.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.first.sub.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.first.sub.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.second.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.second.FooSlots.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.second.FooSlotsInvalid.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_type_links/inspect_type_links.second.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_underscored/inspect_underscored.Class.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_underscored/inspect_underscored.html
Simple merge

diff --cc m.css/documentation/test_python/inspect_value_formatting/inspect_value_formatting.html
Simple merge

diff --cc m.css/documentation/test_python/layout/index.html
Simple merge

diff --cc m.css/documentation/test_python/layout_search_binary/index.html
Simple merge

diff --cc m.css/documentation/test_python/layout_search_open_search/index.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/c.link_formatting.Class.Sub.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/c.link_formatting.Class.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/c.link_formatting.pybind.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/m.link_formatting.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/m.link_formatting.pybind.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/m.link_formatting.sub.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/p.page.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/s.classes.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/s.modules.html
Simple merge

diff --cc m.css/documentation/test_python/link_formatting/s.pages.html
Simple merge

diff --cc m.css/documentation/test_python/page/another.html
Simple merge

diff --cc m.css/documentation/test_python/page/another.rst
Simple merge

diff --cc m.css/documentation/test_python/page/pages.html
Simple merge

diff --cc m.css/documentation/test_python/page_plugins/plots-32.html
index 0000000000000000000000000000000000000000,c1f9746cfbf89066eac3d13d77aa5fe6c7632b79..c1f9746cfbf89066eac3d13d77aa5fe6c7632b79
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/page_plugins/plots-32.html
+++ b/m.css/documentation/test_python/page_plugins/plots-32.html

diff --cc m.css/documentation/test_python/page_plugins/plots-34.html
index 0000000000000000000000000000000000000000,a0b54cf8b8636630f7c11241feb8f605b836d9ee..a0b54cf8b8636630f7c11241feb8f605b836d9ee
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/page_plugins/plots-34.html
+++ b/m.css/documentation/test_python/page_plugins/plots-34.html

diff --cc m.css/documentation/test_python/page_plugins/plots.html
Simple merge

diff --cc m.css/documentation/test_python/page_plugins/plugins/fancyline.py
Simple merge

diff --cc m.css/documentation/test_python/pybind_external_overload_docs/docs.rst
Simple merge

diff --cc m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.Class.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.Class26.html
index 0000000000000000000000000000000000000000,2a742e79d143c7f12cf13503022698ada5c75a14..2a742e79d143c7f12cf13503022698ada5c75a14
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.Class26.html
+++ b/m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.Class26.html

diff --cc m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.cpp
Simple merge

diff --cc m.css/documentation/test_python/pybind_external_overload_docs/pybind_external_overload_docs.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_name_mapping/pybind_name_mapping.Class.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_name_mapping/pybind_name_mapping.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_name_mapping/pybind_name_mapping.submodule.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_signatures/false_positives.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.MyClass.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.MyClass23.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.MyClass26.html
index 0000000000000000000000000000000000000000,f2f556569e26da3a600887397df993c3521db56d..f2f556569e26da3a600887397df993c3521db56d
mode 000000,100644..100644
--- /dev/null
--- 2/documentation/test_python/pybind_signatures/pybind_signatures.MyClass26.html
+++ b/m.css/documentation/test_python/pybind_signatures/pybind_signatures.MyClass26.html

diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.cpp
Simple merge

diff --cc m.css/documentation/test_python/pybind_signatures/pybind_signatures.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_submodules/pybind_submodules.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_submodules_package/pybind_submodules_package.sub.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_type_links/pybind_type_links.Foo.html
Simple merge

diff --cc m.css/documentation/test_python/pybind_type_links/pybind_type_links.cpp
Simple merge

diff --cc m.css/documentation/test_python/pybind_type_links/pybind_type_links.html
Simple merge

diff --cc m.css/documentation/test_python/test_content.py
Simple merge

diff --cc m.css/documentation/test_python/test_inspect.py
Simple merge

diff --cc m.css/documentation/test_python/test_layout.py
Simple merge

diff --cc m.css/documentation/test_python/test_link_formatting.py
Simple merge

diff --cc m.css/documentation/test_python/test_page.py
Simple merge

diff --cc m.css/documentation/test_python/test_pybind.py
Simple merge

diff --cc m.css/documentation/test_python/test_search.py
Simple merge

diff --cc m.css/package/ci/circleci.yml
Simple merge

diff --cc m.css/pelican-theme/test/__init__.py
Simple merge

diff --cc m.css/pelican-theme/test/test_blog.py
Simple merge

diff --cc m.css/pelican-theme/test/test_layout.py
Simple merge

diff --cc m.css/pelican-theme/test/test_page.py
Simple merge

diff --cc m.css/plugins/ansilexer.py
Simple merge

diff --cc m.css/plugins/dot2svg.py
Simple merge

diff --cc m.css/plugins/latex2svg.py
Simple merge

diff --cc m.css/plugins/latex2svgextra.py
Simple merge

diff --cc m.css/plugins/m/__init__.py
Simple merge

diff --cc m.css/plugins/m/abbr.py
Simple merge

diff --cc m.css/plugins/m/alias.py
Simple merge

diff --cc m.css/plugins/m/code.py
Simple merge

diff --cc m.css/plugins/m/components.py
Simple merge

diff --cc m.css/plugins/m/dot.py
Simple merge

diff --cc m.css/plugins/m/dox.py
Simple merge

diff --cc m.css/plugins/m/filesize.py
Simple merge

diff --cc m.css/plugins/m/gh.py
Simple merge

diff --cc m.css/plugins/m/gl.py
Simple merge

diff --cc m.css/plugins/m/htmlsanity.py
Simple merge

diff --cc m.css/plugins/m/images.py
Simple merge

diff --cc m.css/plugins/m/link.py
Simple merge

diff --cc m.css/plugins/m/math.py
Simple merge

diff --cc m.css/plugins/m/metadata.py
Simple merge

diff --cc m.css/plugins/m/plots.py
Simple merge

diff --cc m.css/plugins/m/qr.py
Simple merge

diff --cc m.css/plugins/m/sphinx.py
Simple merge

diff --cc m.css/plugins/m/test/__init__.py
Simple merge

diff --cc m.css/plugins/m/test/code/console-colors.ansi
Simple merge

diff --cc m.css/plugins/m/test/code/page.html
Simple merge

diff --cc m.css/plugins/m/test/code/page.rst
Simple merge

diff --cc m.css/plugins/m/test/components/page.html
Simple merge

diff --cc m.css/plugins/m/test/components/page.rst
Simple merge

diff --cc m.css/plugins/m/test/dot/page-240.html
Simple merge

diff --cc m.css/plugins/m/test/dot/page.html
Simple merge

diff --cc m.css/plugins/m/test/dox/page.html
Simple merge

diff --cc m.css/plugins/m/test/dox/page.rst
Simple merge

diff --cc m.css/plugins/m/test/dox/page_css_classes.html
Simple merge

diff --cc m.css/plugins/m/test/dox/stl.tag
index 0000000000000000000000000000000000000000,893b16e29b759d911bafd8b1c219acf49322b262..893b16e29b759d911bafd8b1c219acf49322b262
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/dox/stl.tag
+++ b/m.css/plugins/m/test/dox/stl.tag

diff --cc m.css/plugins/m/test/htmlsanity_content/page.html
Simple merge

diff --cc m.css/plugins/m/test/htmlsanity_content/page.rst
Simple merge

diff --cc m.css/plugins/m/test/htmlsanity_typography/article-jumbo.html
Simple merge

diff --cc m.css/plugins/m/test/htmlsanity_typography/article-lang.html
Simple merge

diff --cc m.css/plugins/m/test/htmlsanity_typography/author-an-author.html
Simple merge

diff --cc m.css/plugins/m/test/htmlsanity_typography/category-a-category.html
Simple merge

diff --cc m.css/plugins/m/test/htmlsanity_typography/page-lang.html
Simple merge

diff --cc m.css/plugins/m/test/htmlsanity_typography/page.html
Simple merge

diff --cc m.css/plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html
Simple merge

diff --cc m.css/plugins/m/test/images/page.html
Simple merge

diff --cc m.css/plugins/m/test/metadata_typography_html_escape/article.html
Simple merge

diff --cc m.css/plugins/m/test/metadata_typography_html_escape/author-an-author.html
Simple merge

diff --cc m.css/plugins/m/test/metadata_typography_html_escape/category-a-category.html
Simple merge

diff --cc m.css/plugins/m/test/metadata_typography_html_escape/tag-a-tag.html
Simple merge

diff --cc m.css/plugins/m/test/plots/page-32.html
Simple merge

diff --cc m.css/plugins/m/test/plots/page-34.html
index 0000000000000000000000000000000000000000,87863badc262442d776dbbac1e0c533945468c03..87863badc262442d776dbbac1e0c533945468c03
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/plots/page-34.html
+++ b/m.css/plugins/m/test/plots/page-34.html

diff --cc m.css/plugins/m/test/plots/page.html
Simple merge

diff --cc m.css/plugins/m/test/qr/page-py36.html
Simple merge

diff --cc m.css/plugins/m/test/qr/page-py37.html
index 0000000000000000000000000000000000000000,9cc637ca6ca9b182386043ebf2179a30d1e2f379..9cc637ca6ca9b182386043ebf2179a30d1e2f379
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/m/test/qr/page-py37.html
+++ b/m.css/plugins/m/test/qr/page-py37.html

diff --cc m.css/plugins/m/test/qr/page.html
Simple merge

diff --cc m.css/plugins/m/test/test_abbr.py
Simple merge

diff --cc m.css/plugins/m/test/test_alias.py
Simple merge

diff --cc m.css/plugins/m/test/test_code.py
Simple merge

diff --cc m.css/plugins/m/test/test_components.py
Simple merge

diff --cc m.css/plugins/m/test/test_dot.py
Simple merge

diff --cc m.css/plugins/m/test/test_dox.py
Simple merge

diff --cc m.css/plugins/m/test/test_filesize.py
Simple merge

diff --cc m.css/plugins/m/test/test_gh.py
Simple merge

diff --cc m.css/plugins/m/test/test_gl.py
Simple merge

diff --cc m.css/plugins/m/test/test_htmlsanity.py
Simple merge

diff --cc m.css/plugins/m/test/test_images.py
Simple merge

diff --cc m.css/plugins/m/test/test_link.py
Simple merge

diff --cc m.css/plugins/m/test/test_math.py
Simple merge

diff --cc m.css/plugins/m/test/test_metadata.py
Simple merge

diff --cc m.css/plugins/m/test/test_plots.py
Simple merge

diff --cc m.css/plugins/m/test/test_qr.py
Simple merge

diff --cc m.css/plugins/m/test/test_sphinx.py
Simple merge

diff --cc m.css/plugins/m/test/test_vk.py
Simple merge

diff --cc m.css/plugins/m/vk.py
Simple merge

diff --cc m.css/site/pelicanconf.py
Simple merge

diff --cc m.css/site/publishconf.py
Simple merge