diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-21 06:59:53 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-21 06:59:53 (GMT) |
| commit | 5c0d077659e8cb2b78dd96f8c629d8512c583d13 (patch) | |
| tree | 320a11ecb6579ba9691d5e9a43cb51dcd91dcc7b /src/corelib/global/qconfig-dist.h | |
| parent | 4248244704211a45a20a39f390ec00c9687a8d1c (diff) | |
| parent | 513d6bd7388e27f32b2868ded6174ca84212cd1b (diff) | |
| download | Qt-5c0d077659e8cb2b78dd96f8c629d8512c583d13.zip Qt-5c0d077659e8cb2b78dd96f8c629d8512c583d13.tar.gz Qt-5c0d077659e8cb2b78dd96f8c629d8512c583d13.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/corelib/global/qconfig-dist.h')
| -rw-r--r-- | src/corelib/global/qconfig-dist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qconfig-dist.h b/src/corelib/global/qconfig-dist.h index 91d2a89..9f7d05d 100644 --- a/src/corelib/global/qconfig-dist.h +++ b/src/corelib/global/qconfig-dist.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) ** |