diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-16 13:14:47 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-16 13:14:47 (GMT) |
| commit | 386ec93553759b2f15acc8f3f40badae759df0a0 (patch) | |
| tree | 467b0aa7bfefec09efa1f3abb4d29782a2aa85aa /src/corelib | |
| parent | 1306326ab737a0edc24aeb3c50c132eb74c6035e (diff) | |
| parent | f62c8411f5d7932693fbec5746a7e4f683bda5ad (diff) | |
| download | Qt-386ec93553759b2f15acc8f3f40badae759df0a0.zip Qt-386ec93553759b2f15acc8f3f40badae759df0a0.tar.gz Qt-386ec93553759b2f15acc8f3f40badae759df0a0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qdataurl.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qdataurl_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qdataurl.cpp b/src/corelib/io/qdataurl.cpp index 9bb896e..4e2dec2 100644 --- a/src/corelib/io/qdataurl.cpp +++ b/src/corelib/io/qdataurl.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) ** diff --git a/src/corelib/io/qdataurl_p.h b/src/corelib/io/qdataurl_p.h index be5b10d..57cfd75 100644 --- a/src/corelib/io/qdataurl_p.h +++ b/src/corelib/io/qdataurl_p.h @@ -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) ** |