diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2010-05-18 16:58:09 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2010-05-18 16:58:09 +1000 |
| commit | 0dd85c11bae99a83a8907b9ee1e9bc9ebd7feb75 (patch) | |
| tree | 1be5d5ac8d355a3728d889fa76e3b11630b2136f /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 599fc2384ed6b45a798e6540dae0281cbb351bc6 (diff) | |
| parent | bfe7bdb223dc1cb6e0a8fa08cd1d37811fb89399 (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts
Conflicts:
doc/html/qmlcontacts-qmlcontact-cpp.html
doc/html/qmlcontacts-qmlcontact-h.html
doc/html/qt-mobility-project-library.index
plugins/contacts/symbian/inc/filtering/cntfilterchangelog.h
plugins/contacts/symbian/inc/filtering/cntfilterdetailrange.h
plugins/contacts/symbian/inc/filtering/cntfilterinvalid.h
plugins/contacts/symbian/inc/filtering/cntfilterlocalid.h
plugins/contacts/symbian/src/filtering/cntfilterchangelog.cpp
plugins/contacts/symbian/src/filtering/cntfilterdetailrange.cpp
plugins/contacts/symbian/src/filtering/cntfilterinvalid.cpp
plugins/contacts/symbian/src/filtering/cntfilterlocalid.cpp
plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.cpp
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
| -rw-r--r-- | doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp index b2e62bef06..9ddd6775c2 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |