Skip to content
Commit f20e0f45 authored by Volker Krause's avatar Volker Krause
Browse files

Merged conflict detection from Robert.

Merged revisions 680236,680238-680446,680448-680455,680457-680460,680462-680521,680524-680525,680527-680610,680612-680871,680873-680874,680876-682473,682475-682858,682860-682861,682863-683994,683996-685727,685729-685735,685738-685739,685741,685743,685746-685852,685854-685876,685878-686152,686154-686183,686185,686187-686572,686574,686576-686821,686823,686825-688632,688634-688640,688642-688957,688959-689160,689162-694603,694606-694881,694883-695089,695091,695093-695625,695627,695629-697127,697129-697131,697133-697334,697336,697338-697363,697365-697955,697957-698546,698548-698644,698646-698857,698859,698861-699987,699989-700458,700460-700549,700551-701316,701318,701320-701908,701910,701913-701914,701916-702305,702307-703385,703387-703609,703611-703837,703839-704355,704357-704591,704593-705183,705185-705203,705205-705377,705379,705381-705884,705886-705896,705898-706031,706033-706073,706075-706160,706162-706221,706223-706395,706397-706438,706440-708272,708274-708690,708692-708803,708805-708904,708907-709006,709008-709193,709195-709256,709258-709298,709300-710654,710656-710658,710660-710672,710674,710677-710735,710737-714445,714447-714453,714455-714768,714770-715325,715327-715589,715591-715666,715668-716587,716589-716591,716593-716594,716596-717309,717311-717676,717678-720055,720058-720104,720106-720699,720701-720794,720796-722062,722064-723125,723127-724130,724132-724529,724531-724606,724608-724794 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/work/arzie_akonadi

........
  r704593 | arzie | 2007-08-25 16:08:30 +0200 (Sat, 25 Aug 2007) | 1 line
  
  Multipart testdata.
........
  r710561 | arzie | 2007-09-10 12:39:27 +0200 (Mon, 10 Sep 2007) | 1 line
  
  Spelling. Start implementing optimistic locking.
........
  r710678 | arzie | 2007-09-10 18:23:33 +0200 (Mon, 10 Sep 2007) | 1 line
  
  Fixed unittest-values.
........
  r710729 | arzie | 2007-09-10 20:37:00 +0200 (Mon, 10 Sep 2007) | 1 line
  
  Bugfixes (unit test works now).
........
  r712209 | arzie | 2007-09-14 00:16:05 +0200 (Fri, 14 Sep 2007) | 1 line
  
  Added command to remove parts to STORE. Further implemented optimistic locking (disabled for now, doesn't work completely correct yet). Updated unit tests.
........
  r714438 | arzie | 2007-09-19 16:57:33 +0200 (Wed, 19 Sep 2007) | 1 line
  
  Finished revision checking, including added unit test. Allow ItemStoreJob with only a DataReference (instead of an Item). Update Resources to support revision checking.
........

svn path=/trunk/KDE/kdepim/akonadi/libakonadi/; revision=724808
parent b19445c2
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment