diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2013-01-07 15:25:25 +0100 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@jollamobile.com> | 2013-01-08 18:57:48 +0100 |
| commit | aba7b84e6cf11ec36da4ba8213456d5478733ca1 (patch) | |
| tree | d088b593e439e5eb11dc767881dd99fdece694b8 /examples/notesmanagerplugin/notesmanagerplugin.cpp | |
| parent | b351e2eb1204309c1c87b759c2725e5ac8e116d5 (diff) | |
Fix merge error
Change-Id: Ie9c9c4e62a8a4aef4faaf31e005cfcf0c45365e0
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'examples/notesmanagerplugin/notesmanagerplugin.cpp')
0 files changed, 0 insertions, 0 deletions