summaryrefslogtreecommitdiff
path: root/src/modconflicticondelegate.cpp
Commit message (Expand)AuthorAgeFilesLines
* Apply clang-format.Mikaël Capelle2023-07-091-35/+49
* Display children contents in collapsed separator.Mikaël Capelle2021-01-101-25/+8
* Add option to enable/disable displaying conflicts on collapsed separators.Mikaël Capelle2021-01-031-22/+3
* Remove log.Mikaël Capelle2021-01-031-1/+1
* Show conflict icons from children when separator is collapsed.Mikaël Capelle2021-01-031-8/+30
* Clean code and reorganize.Mikaël Capelle2021-01-021-19/+6
* Some cleaning. Avoid using Qt::UserRole.Mikaël Capelle2021-01-021-3/+4
* Separate conflict flags and render them in separate columnsSilarn2019-12-061-0/+160