From kde-commits  Mon Sep 12 18:59:01 2016
From: Sven Langkamp <sven.langkamp () gmail ! com>
Date: Mon, 12 Sep 2016 18:59:01 +0000
To: kde-commits
Subject: [krita] libs/ui: Merge branch 'langkamp/stopgradienteditor'
Message-Id: <E1bjWRZ-0003Bi-Ol () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147370675126186

Git commit 0edbc8b8508a55c0767050bb45fcced77b3bee5e by Sven Langkamp.
Committed on 12/09/2016 at 17:26.
Pushed by langkamp into branch 'master'.

Merge branch 'langkamp/stopgradienteditor'

M  +4    -0    libs/ui/CMakeLists.txt

http://commits.kde.org/krita/0edbc8b8508a55c0767050bb45fcced77b3bee5e

diff --cc libs/ui/CMakeLists.txt
index ad80c50,0d5f3f1..deaa572
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@@ -463,9 -461,9 +466,10 @@@ ki18n_wrap_ui(kritaui_LIB_SRC
      forms/wdgdlgblacklistcleanup.ui
      forms/wdgrectangleconstraints.ui
      forms/wdgimportimagesequence.ui
 +    forms/wdgstrokeselectionproperties.ui
      forms/KisDetailsPaneBase.ui
      forms/KisOpenPaneBase.ui
+     forms/wdgstopgradienteditor.ui
      brushhud/kis_dlg_brush_hud_config.ui
      forms/wdgdlginternalcolorselector.ui
      dialogs/kis_delayed_save_dialog.ui