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

List:       kde-commits
Subject:    [kdelibs/frameworks-kcolors] /: Merge branch 'frameworks' into frameworks-kcolors
From:       Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date:       2012-03-12 19:43:56
Message-ID: 20120312194356.1666FA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 668fab65ad2a48371fe6da543f7e997b47e52d12 by Giorgos Tsiapaliwkas.
Committed on 12/03/2012 at 13:01.
Pushed by tsiapaliwkas into branch 'frameworks-kcolors'.

Merge branch 'frameworks' into frameworks-kcolors

M  +20   -14   CMakeLists.txt
M  +1    -0    kdeui/tests/CMakeLists.txt
M  +0    -1    staging/CMakeLists.txt
R  +4    -5    staging/kdeguiaddons/src/colors/kcolorcollection.cpp
R  +2    -4    staging/kwidgets/src/utils/kguiitem.cpp

http://commits.kde.org/kdelibs/668fab65ad2a48371fe6da543f7e997b47e52d12

diff --cc staging/CMakeLists.txt
index 555524c,ff89040..fe6b10a
--- a/staging/CMakeLists.txt
+++ b/staging/CMakeLists.txt
@@@ -1,11 -1,7 +1,10 @@@
  add_subdirectory(kauth)
  add_subdirectory(sonnet)
- add_subdirectory(kcoreaddons)
  add_subdirectory(karchive)
  add_subdirectory(kde4support)
 +add_subdirectory(kcolorwidgets)
 +add_subdirectory(kdeguiaddons)
 +add_subdirectory(kwidgets)
  if(NOT QT5_BUILD)
    add_subdirectory(kwindowsystem)
    # TODO: Remove this:
[prev in list] [next in list] [prev in thread] [next in thread]