diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-03-08 16:04:05 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-03-08 16:04:05 (GMT) |
| commit | b6cc353adb0613ce41153181b4f08bb81b7acf68 (patch) | |
| tree | 1c25cc922c513f8666470695a0d63b8a19e223a4 /src/corelib/xml/make-parser.sh | |
| parent | 5ef1fb5823a25cd4b27029701f7d707c82750acb (diff) | |
| parent | 206b614f2e9623d792e6f398bf11765a44c272f5 (diff) | |
| download | Qt-b6cc353adb0613ce41153181b4f08bb81b7acf68.zip Qt-b6cc353adb0613ce41153181b4f08bb81b7acf68.tar.gz Qt-b6cc353adb0613ce41153181b4f08bb81b7acf68.tar.bz2 | |
Merge remote branch 'earth/master' into symbian-socket-engine
Conflicts:
src/corelib/kernel/qcore_symbian_p.h
src/network/kernel/qnetworkinterface_symbian.cpp
Diffstat (limited to 'src/corelib/xml/make-parser.sh')
| -rwxr-xr-x | src/corelib/xml/make-parser.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/xml/make-parser.sh b/src/corelib/xml/make-parser.sh index 89af678..7bfb1bc 100755 --- a/src/corelib/xml/make-parser.sh +++ b/src/corelib/xml/make-parser.sh @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################# ## -## 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) ## |