diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-05-13 08:51:49 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-05-13 08:51:49 +1000 |
| commit | ba93174f0d1d9930c6f53dae91cccf27a3430fa9 (patch) | |
| tree | 190f0362230ad4a87b93457cd4ebffd3fd727039 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 469b9cf754e591c02007ea9b76575ce101b680b6 (diff) | |
| parent | eeb36846a90907a3a9ea79d51a2b7a25701769bf (diff) | |
Merge branch 'main_1.0' into sensors_1.0
Conflicts:
examples/sensors/grueplugin/grueplugin.pro
examples/sensors/sensors.pro
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 fca0d86ae6..0aed2f32df 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) ** |