summaryrefslogtreecommitdiff
path: root/src/assistant/help/qhelpgenerator_p.h
diff options
context:
space:
mode:
authorJohanna Aijala <johanna.aijala@digia.com>2013-02-21 09:38:02 +0200
committerJohanna Aijala <johanna.aijala@digia.com>2013-02-21 09:39:00 +0200
commitff8399920bbe272e573782e9b134e13f1726edb9 (patch)
treec84deaee9e240543eebd19a5e96e062a5ed141f5 /src/assistant/help/qhelpgenerator_p.h
parent206897d96f337f139870a2eaf173543898e7cc29 (diff)
parent98cbd8ba0b1b91206ddd9cbf88ed4fc255e9aeb8 (diff)
downloadqttools-ff8399920bbe272e573782e9b134e13f1726edb9.tar.gz
Merge branch 'stable' into release
Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997
Diffstat (limited to 'src/assistant/help/qhelpgenerator_p.h')
-rw-r--r--src/assistant/help/qhelpgenerator_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/assistant/help/qhelpgenerator_p.h b/src/assistant/help/qhelpgenerator_p.h
index 698c4ae4a..3c447e898 100644
--- a/src/assistant/help/qhelpgenerator_p.h
+++ b/src/assistant/help/qhelpgenerator_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt Assistant of the Qt Toolkit.