summaryrefslogtreecommitdiffstats
path: root/conduits/docconduit/doc-conflictdialog.cpp
Commit message (Expand)AuthorAgeFilesLines
* Renaming of files in preparation for code style tools.Michele Calgaro2021-05-291-0/+182