Upstream merge conflict

.codedocs

@@ -1,3 +1,3 @@
-EXCLUDE = addon cmake doc examples jquery templates testing winbuild src/logos.cpp src/lodepng.cpp
+EXCLUDE = addon cmake doc examples jquery templates testing deps/iconv_winbuild src/logos.cpp src/lodepng.cpp
 FILE_PATTERNS = *.h *.cpp *.md
 USE_MDFILE_AS_MAINPAGE = src/doxygen.md

.dockerignore

@@ -0,0 +1,27 @@
+*~
+.*sw?
+\#*
+.DS_Store
+
+*.rej
+*.orig
+
+*.pro
+/packages/rpm/doxygen.spec
+*.idb
+*.pdb
+
+/doxygen_docs
+/doxygen.tag
+/build*
+/qtools_docs
+/warnings.log
+
+tags
+
+.idea
+
+/examples/html/*
+/examples/latex/*
+
+Dockerfile

.editorconfig

@@ -3,3 +3,7 @@
 [*]
 indent_style = space
 indent_size = 2
+charset = utf-8
+
+[*.py]
+indent_size = 4

.gitattributes

@@ -0,0 +1,9 @@
+* text=auto eol=lf
+* text
+
+### Protected
+*.pdf binary
+*.ico binary
+*.jpg binary
+*.png binary
+*.lib binary 

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: doxygen
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/report-a-bug-or-issue.md

@@ -10,18 +10,18 @@ assignees: ''
 **Describe the bug**
 Describe what you see that (you think) is wrong.
 
-**Expected behavior**
-Describe what you would have expected or think is correct.
-
 **Screenshots**
 If useful, add screenshots to help explain your problem.
 
 **To Reproduce**
 Attach a self contained example that allows us to reproduce the problem.
 Such an example typically exist of some source code (can be dummy code) and a doxygen configuration file used (you can strip it using `doxygen -s -u`). After you verified the example demonstrates the problem, put it in a zip (or tarball) and attach it to the bug report. Try to avoid linking to external sources, since they might disappear in the future.
 
+**Expected behavior**
+Describe what you would have expected or think is correct.
+
 **Version**
-Mention the version of doxygen used (output of `doxygen --version`) and the platform on which you run doxygen (e.g. Windows 10, 64 bit). If you run doxygen under Linux please also mention the name and version of the distribution used (output of `lsb_release -a`) and mention if you compiled doxygen yourself or that you use a binary that comes with the distribution or from the doxygen website.  
+Mention the version of doxygen used (output of `doxygen --version`) and the platform on which you run doxygen (e.g. Windows 10, 64 bit). If you run doxygen under Linux please also mention the name and version of the distribution used (output of `lsb_release -a`) and mention if you compiled doxygen yourself or that you use a binary that comes with the distribution or from the doxygen website.
 
 **Stack trace**
 If you encounter a crash and can build doxygen from sources yourself with debug info (`-DCMAKE_BUILD_TYPE=Debug`), a stack trace can be very helpful (especially if it is not possible to capture the problem in a small example that can be shared).

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"