diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-13 15:18:37 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-13 15:18:37 (GMT) |
| commit | 83dc0f2bc78336d117f4842d0b030cc5f0a41eb4 (patch) | |
| tree | dfbe406eafc21343c65925234365f1fb276c1f04 /src/qt3support/tools/q3intcache.qdoc | |
| parent | e63c88ac355f9b8b029faab599fb35756f22fb2e (diff) | |
| parent | 9ff210a8ba748ce3d46441886c8feb407e3aa9a6 (diff) | |
| download | Qt-83dc0f2bc78336d117f4842d0b030cc5f0a41eb4.zip Qt-83dc0f2bc78336d117f4842d0b030cc5f0a41eb4.tar.gz Qt-83dc0f2bc78336d117f4842d0b030cc5f0a41eb4.tar.bz2 | |
Merge branch '4.7' of ../qt into 4.7
Conflicts:
doc/src/declarative/qdeclarativeintro.qdoc
doc/src/declarative/qdeclarativereference.qdoc
doc/src/snippets/declarative/focus/focusColumn.qml
tools/qdoc3/apigenerator.cpp
tools/qdoc3/apigenerator.h
tools/qdoc3/archiveextractor.cpp
tools/qdoc3/bookgenerator.cpp
tools/qdoc3/bookgenerator.h
tools/qdoc3/ccodeparser.cpp
tools/qdoc3/command.cpp
tools/qdoc3/command.h
tools/qdoc3/cpptoqsconverter.cpp
tools/qdoc3/dcfsection.cpp
tools/qdoc3/dcfsection.h
tools/qdoc3/jambiapiparser.cpp
tools/qdoc3/jambiapiparser.h
tools/qdoc3/javacodemarker.cpp
tools/qdoc3/javacodemarker.h
tools/qdoc3/javadocgenerator.cpp
tools/qdoc3/javadocgenerator.h
tools/qdoc3/linguistgenerator.cpp
tools/qdoc3/linguistgenerator.h
tools/qdoc3/loutgenerator.h
tools/qdoc3/mangenerator.cpp
tools/qdoc3/mangenerator.h
tools/qdoc3/polyarchiveextractor.cpp
tools/qdoc3/polyarchiveextractor.h
tools/qdoc3/polyuncompressor.cpp
tools/qdoc3/polyuncompressor.h
tools/qdoc3/qsakernelparser.cpp
tools/qdoc3/qscodemarker.cpp
tools/qdoc3/qscodemarker.h
tools/qdoc3/qscodeparser.cpp
tools/qdoc3/qscodeparser.h
tools/qdoc3/sgmlgenerator.cpp
tools/qdoc3/sgmlgenerator.h
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/uncompressor.cpp
tools/qdoc3/webxmlgenerator.cpp
tools/qdoc3/webxmlgenerator.h
Diffstat (limited to 'src/qt3support/tools/q3intcache.qdoc')
| -rw-r--r-- | src/qt3support/tools/q3intcache.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/tools/q3intcache.qdoc b/src/qt3support/tools/q3intcache.qdoc index 78c6a82..02af31c 100644 --- a/src/qt3support/tools/q3intcache.qdoc +++ b/src/qt3support/tools/q3intcache.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** 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) ** |