[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-scripting-rempt] krita/plugins/extensions: Merge branch 'master' into krita-scriptin
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2014-07-28 8:28:54
Message-ID: E1XBgIg-0003nA-Uj () scm ! kde ! org
[Download RAW message or body]

Git commit 8d8b3148b0bacae55ba4f64986f59bf6ab814ef9 by Boudewijn Rempt.
Committed on 28/07/2014 at 08:28.
Pushed by rempt into branch 'krita-scripting-rempt'.

Merge branch 'master' into krita-scripting-rempt

Conflicts:
	CMakeLists.txt

M  +6    -1    krita/plugins/extensions/CMakeLists.txt

http://commits.kde.org/calligra/8d8b3148b0bacae55ba4f64986f59bf6ab814ef9

diff --cc krita/plugins/extensions/CMakeLists.txt
index 583089a,182240c..4c2a9b0
--- a/krita/plugins/extensions/CMakeLists.txt
+++ b/krita/plugins/extensions/CMakeLists.txt
@@@ -14,8 -14,12 +14,13 @@@ add_subdirectory( separate_channels =

  add_subdirectory( shearimage )
  add_subdirectory( dockers )
  add_subdirectory( layergroupswitcher )
 +add_subdirectory( pyqt )
  =

+ option(WITH_RESOURCE_MANAGER "Build the experimental resource manager" OF=
F)
+ if (WITH_RESOURCE_MANAGER)
+     add_subdirectory( resourcemanager )
+ endif()
+ =

  # Allow to skip building GMIC plugin
  option(WITH_GMIC "Build the G'Mic plugin" ON)
  if(WITH_GMIC)
[prev in list] [next in list] [prev in thread] [next in thread]