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

List:       kde-commits
Subject:    [kdepim] kalarm: Merge commit '8bae32aa22e2b4aa06313b1f6f92ba3d409d8da3'
From:       David Jarvie <djarvie () kde ! org>
Date:       2014-09-30 22:11:41
Message-ID: E1XZ5e1-0005mq-06 () scm ! kde ! org
[Download RAW message or body]

Git commit 8eff9a4634d7520a8f85122121e2969a8226c318 by David Jarvie.
Committed on 30/09/2014 at 22:14.
Pushed by djarvie into branch 'master'.

Merge commit '8bae32aa22e2b4aa06313b1f6f92ba3d409d8da3'

M  +1    -0    kalarm/collectionmodel.cpp

http://commits.kde.org/kdepim/8eff9a4634d7520a8f85122121e2969a8226c318

diff --cc kalarm/collectionmodel.cpp
index 6a2d859,6b84559..b33490b
--- a/kalarm/collectionmodel.cpp
+++ b/kalarm/collectionmodel.cpp
@@@ -928,6 -927,7 +928,7 @@@ CalEvent::Types CollectionControlModel:
                  // The collection duplicates the backend storage
                  // used by another enabled collection.
                  // N.B. don't refresh this collection - assume no change.
 -                kDebug() << "Collection" << c.id() << "duplicates backend for" << collection.id();
++                qDebug() << "Collection" << c.id() << "duplicates backend for" << collection.id();
                  if (c.hasAttribute<CollectionAttribute>())
                  {
                      types &= ~c.attribute<CollectionAttribute>()->enabled();
[prev in list] [next in list] [prev in thread] [next in thread]