diff options
| author | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
| commit | 1c48ec8f4876db0b4c7b86dd19ab8bb27c082786 (patch) | |
| tree | 8ca2723a27ae670b3e84dfb21b6a3a28d3bbe401 /src/declarative/util/qmlstateoperations.cpp | |
| parent | 0374c15075f98b0b4efbb1c00ef3812b67fabe0f (diff) | |
| parent | ade4d096fc2ea145a3d9586e3ab2a9af9c5a9a72 (diff) | |
| download | Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.zip Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.gz Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'src/declarative/util/qmlstateoperations.cpp')
| -rw-r--r-- | src/declarative/util/qmlstateoperations.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index cefe2bc..d1b2339 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.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) ** |