summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorSilarn <jrim@rimpo.org>2019-12-06 23:12:18 -0600
committerSilarn <jrim@rimpo.org>2019-12-06 23:12:18 -0600
commitb3331ef2c0b50ab2cea4c328e78f6ab58bca099d (patch)
treee0be0d00f40733baa4692120d0266ae797ab3785 /src/CMakeLists.txt
parentd42bca5bc0043337f8de72ea72544ebabc505f8b (diff)
Separate conflict flags and render them in separate columns
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a46908ef..d0215930 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -114,6 +114,7 @@ SET(organizer_SRCS
previewdialog.cpp
aboutdialog.cpp
modflagicondelegate.cpp
+ modconflicticondelegate.cpp
genericicondelegate.cpp
organizerproxy.cpp
viewmarkingscrollbar.cpp
@@ -238,6 +239,7 @@ SET(organizer_HDRS
previewdialog.h
aboutdialog.h
modflagicondelegate.h
+ modconflicticondelegate.h
genericicondelegate.h
organizerproxy.h
viewmarkingscrollbar.h
@@ -491,6 +493,7 @@ set(widgets
loglist
loghighlighter
modflagicondelegate
+ modconflicticondelegate
modidlineedit
noeditdelegate
qtgroupingproxy