diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-11 03:48:51 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-11 03:48:51 (GMT) |
commit | 4f3587e749a8503f6207174705ed5db74affb3a5 (patch) | |
tree | 29bb27e481bab4e1b63f5f04967f59f10328a8ea /examples/declarative | |
parent | c765eb96672b6501f13491f6e9f7e7ed46ba9385 (diff) | |
parent | ce59628ba366800fe2f3afdadc37be02f98480a7 (diff) | |
download | Qt-4f3587e749a8503f6207174705ed5db74affb3a5.zip Qt-4f3587e749a8503f6207174705ed5db74affb3a5.tar.gz Qt-4f3587e749a8503f6207174705ed5db74affb3a5.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Update copyright year to 2011.
Diffstat (limited to 'examples/declarative')
-rw-r--r-- | examples/declarative/positioners/layoutdirection/layoutdirection.qml | 2 | ||||
-rw-r--r-- | examples/declarative/touchinteraction/pincharea/flickresize.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/positioners/layoutdirection/layoutdirection.qml b/examples/declarative/positioners/layoutdirection/layoutdirection.qml index 3e23b15..89a860e 100644 --- a/examples/declarative/positioners/layoutdirection/layoutdirection.qml +++ b/examples/declarative/positioners/layoutdirection/layoutdirection.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/declarative/touchinteraction/pincharea/flickresize.qml b/examples/declarative/touchinteraction/pincharea/flickresize.qml index 9439ace..cf5278d 100644 --- a/examples/declarative/touchinteraction/pincharea/flickresize.qml +++ b/examples/declarative/touchinteraction/pincharea/flickresize.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |