diff options
| author | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-10-08 11:15:39 +1000 |
|---|---|---|
| committer | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-10-08 11:20:56 +1000 |
| commit | aeffc9ffa371321a13a2a92faaff9071d91f09ed (patch) | |
| tree | db85509a52788014542ea0e6f6eb29c9b56ba7f4 /doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp | |
| parent | ecd1e7131c6241a5ec0733489ccc4c816f0efa4d (diff) | |
| parent | e45d99d138fd05ff08f73bdde1cf1cbf4c9bfe48 (diff) | |
Merge remote branch 'origin/1.1' into new-items
Conflicts:
plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchiteminstance/tst_symbianasynchfetchiteminstance.cpp
src/organizer/qorganizeritemmanager.cpp
src/s60installs/eabi/QtOrganizeru.def
Diffstat (limited to 'doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp')
0 files changed, 0 insertions, 0 deletions