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

List:       kde-commits
Subject:    [calligra] krita/plugins/extensions/dockers: Merge remote-tracking
From:       Silvio Heinrich <plassy () web ! de>
Date:       2011-08-06 14:18:10
Message-ID: 20110806141810.57F4AA60AE () git ! kde ! org
[Download RAW message or body]

Git commit 5ec199be02e6d2668e658abf70c33ad96425036a by Silvio Heinrich.
Committed on 06/08/2011 at 16:16.
Pushed by heinrich into branch 'master'.

Merge remote-tracking branch 'origin/krita-artisticcolorselector-silvioheinrich'

Conflicts:
	krita/plugins/extensions/dockers/CMakeLists.txt

M  +1    -0    krita/plugins/extensions/dockers/CMakeLists.txt

http://commits.kde.org/calligra/5ec199be02e6d2668e658abf70c33ad96425036a

diff --cc krita/plugins/extensions/dockers/CMakeLists.txt
index d1c0d09,d9ec8f6..c930c35
--- a/krita/plugins/extensions/dockers/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/CMakeLists.txt
@@@ -6,4 -7,4 +6,5 @@@ add_subdirectory(advancedcolorselector
  add_subdirectory(presetdocker)
  add_subdirectory(historydocker)
  add_subdirectory(channeldocker)
 -add_subdirectory(artisticcolorselector)
 +add_subdirectory(imagedocker)
++add_subdirectory(artisticcolorselector)

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