diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-01-30 14:39:06 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-01-30 14:40:26 +0200 |
| commit | 9772474dd97e5543035b5fd0dde4b731745e5057 (patch) | |
| tree | 3319e942a3c59f0b83fbeee90e33728497875379 /examples/doc/componenterror.qdoc | |
| parent | 7121482f04c0ffb31411cc2037dc34cc66888a8f (diff) | |
| parent | c9d11cc9915dea32d1aff9d63427bca1c3399400 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
Changelog
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
src/libs/installer/lib7z_create.h
src/libs/kdtools/kdgenericfactory.cpp
src/libs/kdtools/kdgenericfactory.h
src/libs/kdtools/kdupdaterapplication.cpp
src/libs/kdtools/kdupdaterapplication.h
src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp
src/libs/kdtools/kdupdaterupdatesourcesinfo.h
src/libs/kdtools/localpackagehub.cpp
src/libs/kdtools/localpackagehub.h
src/libs/kdtools/updatefinder.cpp
src/libs/kdtools/updatefinder.h
tools/binarycreator/resources/mkdmg.sh
Change-Id: Iab2513f549832d2e750e77131c673457ab265af4
Diffstat (limited to 'examples/doc/componenterror.qdoc')
| -rw-r--r-- | examples/doc/componenterror.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/doc/componenterror.qdoc b/examples/doc/componenterror.qdoc index 8fd7bf410..9e70760d7 100644 --- a/examples/doc/componenterror.qdoc +++ b/examples/doc/componenterror.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. |