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

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepimlibs (merge)
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-01-11 11:12:54
Message-ID: 1263208374.595882.16873.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1072991 by vkrause:

SVN_MERGE

Merged revisions 1071689,1071707,1071830,1071832,1071884,1071984,1072310,1072327,1072342,1072412,1072419,1072422,1072424 \
via svnmerge from  https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1071689 | tokoe | 2010-01-08 15:45:24 +0100 (Fri, 08 Jan 2010) | 2 lines
  
  Mark failing tests as expected as long as we have no test server setup
........
  r1071707 | toma | 2010-01-08 16:26:43 +0100 (Fri, 08 Jan 2010) | 2 lines
  
  Pretty common, don't create noise.
........
  r1071830 | djarvie | 2010-01-08 22:23:07 +0100 (Fri, 08 Jan 2010) | 2 lines
  
  Fix setting background colour
........
  r1071832 | winterz | 2010-01-08 22:32:58 +0100 (Fri, 08 Jan 2010) | 4 lines
  
  remove the debugging printf in the shift operation.
  CCMAIL: iann_bugzilla@blueyonder.co.uk
  DO_NOT_BACKPORT: possibly dangerous since nobody really knows this code anymore.
........
  r1071884 | djarvie | 2010-01-09 00:18:47 +0100 (Sat, 09 Jan 2010) | 2 lines
  
  apidox++
........
  r1071984 | mlaurent | 2010-01-09 10:34:27 +0100 (Sat, 09 Jan 2010) | 2 lines
  
  Fix iterator
........
  r1072310 | djarvie | 2010-01-09 23:20:56 +0100 (Sat, 09 Jan 2010) | 1 line
  
  Minor corrections
........
  r1072327 | tokoe | 2010-01-10 00:05:13 +0100 (Sun, 10 Jan 2010) | 4 lines
  
  Add edit field for categories
  
  CCMAIL: annew@kde.org
........
  r1072342 | tokoe | 2010-01-10 01:34:45 +0100 (Sun, 10 Jan 2010) | 2 lines
  
  Remove job->exec() calls from apidocs examples
........
  r1072412 | toma | 2010-01-10 09:18:18 +0100 (Sun, 10 Jan 2010) | 2 lines
  
  New failing test case for review.
........
  r1072419 | tokoe | 2010-01-10 09:29:40 +0100 (Sun, 10 Jan 2010) | 3 lines
  
  Unbreak test case with removing unneeded QEXPECT_FAIL
........
  r1072422 | tokoe | 2010-01-10 09:49:38 +0100 (Sun, 10 Jan 2010) | 2 lines
  
  Unbreak tests by removing wrong QEXPECT_FAIL
........
  r1072424 | tokoe | 2010-01-10 09:55:28 +0100 (Sun, 10 Jan 2010) | 2 lines
  
  Enable postgres tests now that we can start our internal server
........


 _M            . (directory)  
 M  +6 -3      akonadi/Mainpage.dox  
 M  +14 -2     akonadi/collection.h  
 M  +10 -4     akonadi/collectioncopyjob.h  
 M  +14 -2     akonadi/collectionstatistics.h  
 M  +14 -2     akonadi/collectionstatisticsjob.h  
 M  +11 -2     akonadi/contact/CMakeLists.txt  
 A             akonadi/contact/editor/categorieseditwidget.cpp   \
trunk/KDE/kdepimlibs/akonadi/contact/editor/categorieseditwidget.cpp#1072424 \
[License: LGPL (v2+)]  A             akonadi/contact/editor/categorieseditwidget.h   \
trunk/KDE/kdepimlibs/akonadi/contact/editor/categorieseditwidget.h#1072424 [License: \
LGPL (v2+)]  M  +25 -0     akonadi/contact/editor/contacteditorwidget.cpp  
 A             akonadi/contact/editor/kedittagsdialog.cpp   \
trunk/KDE/kdepimlibs/akonadi/contact/editor/kedittagsdialog.cpp#1072424 [License: \
LGPL (v2)]  A             akonadi/contact/editor/kedittagsdialog_p.h   \
trunk/KDE/kdepimlibs/akonadi/contact/editor/kedittagsdialog_p.h#1072424 [License: \
LGPL (v2)]  A             akonadi/contact/editor/tagwidget.cpp   \
trunk/KDE/kdepimlibs/akonadi/contact/editor/tagwidget.cpp#1072424 [License: LGPL \
(v2+)]  A             akonadi/contact/editor/tagwidget.h   \
trunk/KDE/kdepimlibs/akonadi/contact/editor/tagwidget.h#1072424 [License: LGPL (v2+)] \
M  +1 -1      akonadi/entitytreemodel.cpp    M  +10 -4     akonadi/itemcopyjob.h  
 M  +10 -4     akonadi/itemcreatejob.h  
 M  +13 -4     akonadi/itemfetchjob.h  
 M  +19 -6     akonadi/itemmodifyjob.h  
 M  +9 -4      akonadi/linkjob.h  
 M  +12 -6     akonadi/searchcreatejob.h  
 M  +8 -2      akonadi/selectionproxymodel.h  
 M  +2 -2      akonadi/tests/CMakeLists.txt  
 M  +0 -2      akonadi/tests/itemappendtest.cpp  
 M  +0 -2      akonadi/tests/itemstoretest.cpp  
 M  +1 -7      akonadi/tests/unittestenv/xdgconfig-postgresql.db/akonadi/akonadiserverrc \
  M  +1 -8      akonadi/tests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc \
  M  +10 -1     akonadi/transactionsequence.h  
 M  +9 -4      akonadi/unlinkjob.h  
 M  +1 -1      kcal/incidenceformatter.cpp  
 M  +3 -3      kholidays/parseholiday.c  
 M  +1 -1      kholidays/parseholiday.y  
 M  +3 -0      kldap/tests/testkldap.cpp  
 M  +1 -1      kmime/kmime_content.cpp  
 M  +12 -0     kmime/tests/headertest.cpp  


http://websvn.kde.org/?view=rev&revision=1072991


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