summaryrefslogtreecommitdiffstats
path: root/conduits/docconduit/doc-conflictdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Renaming of files in preparation for code style tools.Michele Calgaro2021-05-291-0/+182
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 66abbed5e08370412b81be1628590898ceeeb604)