diff options
author | axis <qt-info@nokia.com> | 2011-01-31 11:37:19 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-01-31 11:37:19 (GMT) |
commit | 5cd39cd8a70be4c22164fe060ad64a1d9108bf41 (patch) | |
tree | 4b072c7d4e4d717fe8f0977dd2108837ac71f7c3 /examples/activeqt/wrapper | |
parent | c40ae86025856225e74289249ecc509bf61dc9ba (diff) | |
parent | 9c132451acc7fbed1611fd3676cceb26e815f50d (diff) | |
download | Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.zip Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.tar.gz Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Diffstat (limited to 'examples/activeqt/wrapper')
-rw-r--r-- | examples/activeqt/wrapper/main.cpp | 2 | ||||
-rw-r--r-- | examples/activeqt/wrapper/wrapperax.rc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/activeqt/wrapper/main.cpp b/examples/activeqt/wrapper/main.cpp index ee6cd88..49756d7 100644 --- a/examples/activeqt/wrapper/main.cpp +++ b/examples/activeqt/wrapper/main.cpp @@ -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/activeqt/wrapper/wrapperax.rc b/examples/activeqt/wrapper/wrapperax.rc index 5799437..0ccf606 100644 --- a/examples/activeqt/wrapper/wrapperax.rc +++ b/examples/activeqt/wrapper/wrapperax.rc @@ -18,7 +18,7 @@ BEGIN VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)" VALUE "FileDescription", "Wrapper Example (ActiveQt)" VALUE "FileVersion", "1.0.0.0" - VALUE "LegalCopyright", "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)." + VALUE "LegalCopyright", "Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)." VALUE "InternalName", "wrapperax.dll" VALUE "OriginalFilename", "wrapperax.dll" VALUE "ProductName", "Wrapper Example (ActiveQt)" |