diff options
| author | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-04-11 06:18:57 (GMT) |
|---|---|---|
| committer | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-04-11 06:18:57 (GMT) |
| commit | 65d255c80d0e029bc94b320fa315095b957098a0 (patch) | |
| tree | d9b5bdb1474f22507e46f5525777ffc43277f081 /config.profiles | |
| parent | fe4e8d469938f2c337e186c03930d543677c3ee2 (diff) | |
| parent | 082b9125d627df11692f2a03b80c9e962e82eda5 (diff) | |
| download | Qt-65d255c80d0e029bc94b320fa315095b957098a0.zip Qt-65d255c80d0e029bc94b320fa315095b957098a0.tar.gz Qt-65d255c80d0e029bc94b320fa315095b957098a0.tar.bz2 | |
Merge remote branch 'qt-master/master'
Conflicts:
src/s60installs/qt.iby
Diffstat (limited to 'config.profiles')
| -rwxr-xr-x | config.profiles/harmattan/tests/create_tests_xml | 2 | ||||
| -rw-r--r-- | config.profiles/harmattan/tests/maemo_tests.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config.profiles/harmattan/tests/create_tests_xml b/config.profiles/harmattan/tests/create_tests_xml index d6122bc..f872633 100755 --- a/config.profiles/harmattan/tests/create_tests_xml +++ b/config.profiles/harmattan/tests/create_tests_xml @@ -2,7 +2,7 @@ ############################################################################# ## -## 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/config.profiles/harmattan/tests/maemo_tests.prf b/config.profiles/harmattan/tests/maemo_tests.prf index 1b87781..5608cd7 100644 --- a/config.profiles/harmattan/tests/maemo_tests.prf +++ b/config.profiles/harmattan/tests/maemo_tests.prf @@ -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) ## |