diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-07 11:24:44 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-07 11:24:44 (GMT) |
| commit | f16556359c24b04afe5af53ddbb80c4392d6dabb (patch) | |
| tree | 5e2fc0123601bd3cc27d0a07236a62d2d8bd418a /doc/src/snippets/xml/simpleparse | |
| parent | 45af493eeeb408f756cc7d76088cbc3e35f5f54b (diff) | |
| parent | 828b1299e1ecb2da23799a2e49370e00dcf9c126 (diff) | |
| download | Qt-f16556359c24b04afe5af53ddbb80c4392d6dabb.zip Qt-f16556359c24b04afe5af53ddbb80c4392d6dabb.tar.gz Qt-f16556359c24b04afe5af53ddbb80c4392d6dabb.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/snippets/xml/simpleparse')
| -rw-r--r-- | doc/src/snippets/xml/simpleparse/handler.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/xml/simpleparse/handler.h | 2 | ||||
| -rw-r--r-- | doc/src/snippets/xml/simpleparse/main.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/xml/simpleparse/handler.cpp b/doc/src/snippets/xml/simpleparse/handler.cpp index 89d7e17..a63bcee 100644 --- a/doc/src/snippets/xml/simpleparse/handler.cpp +++ b/doc/src/snippets/xml/simpleparse/handler.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/doc/src/snippets/xml/simpleparse/handler.h b/doc/src/snippets/xml/simpleparse/handler.h index 3c17219..338b554 100644 --- a/doc/src/snippets/xml/simpleparse/handler.h +++ b/doc/src/snippets/xml/simpleparse/handler.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) ** diff --git a/doc/src/snippets/xml/simpleparse/main.cpp b/doc/src/snippets/xml/simpleparse/main.cpp index 942d9a1..a1f346b 100644 --- a/doc/src/snippets/xml/simpleparse/main.cpp +++ b/doc/src/snippets/xml/simpleparse/main.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) ** |