diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-21 15:33:57 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-21 15:33:57 (GMT) |
| commit | 226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22 (patch) | |
| tree | 491c25c4c9f08b6ef732a9179d2e64776a9e8446 /tools/porting/src/cpplexer.cpp | |
| parent | 84a1df764bf2e29e9e6e43f4f0e1a69201199fbc (diff) | |
| parent | 59a35a794e433f9526aff72025c0899e76ef362e (diff) | |
| download | Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.zip Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.gz Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/util/qdeclarativeanimation.cpp
Diffstat (limited to 'tools/porting/src/cpplexer.cpp')
| -rw-r--r-- | tools/porting/src/cpplexer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/porting/src/cpplexer.cpp b/tools/porting/src/cpplexer.cpp index b5c7bd0..c431924 100644 --- a/tools/porting/src/cpplexer.cpp +++ b/tools/porting/src/cpplexer.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2001-2004 Roberto Raggi -** 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) ** |