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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim
From:       Allen Winter <winter () kde ! org>
Date:       2010-09-24 1:57:00
Message-ID: 20100924020220.E895AAC88C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1178836 by winterz:

Major re-working of conflict handling.
Now can turn-off conflict handling "forever".
You can also set conflict handling options globally or on a per-folder basis.
Also includes a much nicer re-work of the conflict handling dialog.
kolab/issue4112

MERGE: trunk? (akonadi does conflict handling already, so probably not)


 M  +114 -8    kresources/kolab/kcal/resourcekolab.cpp  
 M  +329 -269  libkdepim/kincidencechooser.cpp  
 M  +62 -30    libkdepim/kincidencechooser.h  
 M  +24 -7     libkdepim/tests/testkincidencechooser.cpp  


http://websvn.kde.org/?view=rev&revision=1178836
[prev in list] [next in list] [prev in thread] [next in thread]