~ubuntu-branches/ubuntu/vivid/akonadi/vivid

« back to all changes in this revision

Viewing changes to server/src/handler.cpp

  • Committer: Package Import Robot
  • Author(s): Scarlett Clark
  • Date: 2014-07-18 15:38:49 UTC
  • mfrom: (1.1.52)
  • Revision ID: package-import@ubuntu.com-20140718153849-mrt24e3jsxxikq7m
Tags: 1.12.91-0ubuntu1
* New upstream release needed for KDE 4.13.90 beta 2
* Remove patches applied upstream.
* Update symbols with batchpatch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
41
41
#include "handler/list.h"
42
42
#include "handler/login.h"
43
43
#include "handler/logout.h"
 
44
#include "handler/merge.h"
44
45
#include "handler/modify.h"
45
46
#include "handler/move.h"
46
47
#include "handler/remove.h"
212
213
    if ( command == AKONADI_CMD_TAGSTORE ) {
213
214
      return new TagStore();
214
215
    }
 
216
    if ( command == AKONADI_CMD_MERGE ) {
 
217
      return new Merge();
 
218
    }
215
219
 
216
220
    return 0;
217
221
}