summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/javacodemarker.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-14 07:07:23 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-14 07:07:23 (GMT)
commitf4f858578afe507ecfebd807f28bad025a85e1b9 (patch)
tree1ad38cd654e5a86050e24c7206a0f28f60daf0c1 /tools/qdoc3/javacodemarker.cpp
parentcf8c14da45187081c50b3b7f2e6e4df4068e8728 (diff)
parentaa020f60e07eefb81c89a9c94b035b748a4e872c (diff)
downloadQt-f4f858578afe507ecfebd807f28bad025a85e1b9.zip
Qt-f4f858578afe507ecfebd807f28bad025a85e1b9.tar.gz
Qt-f4f858578afe507ecfebd807f28bad025a85e1b9.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/qdoc3/javacodemarker.cpp')
-rw-r--r--tools/qdoc3/javacodemarker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/javacodemarker.cpp b/tools/qdoc3/javacodemarker.cpp
index 302c14b..1918cd8 100644
--- a/tools/qdoc3/javacodemarker.cpp
+++ b/tools/qdoc3/javacodemarker.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)
**