diff options
| author | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-03-11 10:53:19 +1000 |
|---|---|---|
| committer | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-03-11 11:36:09 +1000 |
| commit | c252428c90de27ce601e9beb50f1e81c9b5e1c3e (patch) | |
| tree | f657eccafe414b846950d13dd3afc7a5de2f2d4d /doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp | |
| parent | 23524985d1890de0675bad879ed99cbc503d4d46 (diff) | |
| parent | 18c47487504b234900b2959858e8af46b09c7b4a (diff) | |
Merge branch 'master' into versit-api
Conflicts:
tests/auto/qversitcontactexporter/tst_qversitcontactexporter.cpp
tests/auto/qversitcontactimporter/tst_qversitcontactimporter.cpp
tests/auto/qversitreader/tst_qversitreader.cpp
tests/auto/qversitwriter/tst_qversitwriter.cpp
Diffstat (limited to 'doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp')
0 files changed, 0 insertions, 0 deletions