diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-01-28 11:22:37 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-01-28 11:22:37 +0100 |
| commit | db46956af0862a6595f068df553004e53df5f5d6 (patch) | |
| tree | b9b59b7f74c2232b8c10b04a923130726310c931 /examples/examples.qbs | |
| parent | 10b00e5c63af399775a7d1b2da3ea8df807eee98 (diff) | |
| parent | d4010ce842360d0fa5ba67f8dcb3267aae49092c (diff) | |
Merge branch '1.3' into 'master'
Conflicts:
doc/reference/jsextensions/jsextensions-general.qdoc
src/lib/corelib/language/evaluatorscriptclass.cpp
src/lib/corelib/language/evaluatorscriptclass.h
Change-Id: Ic9b77b56e8fc8bf93e0a553930757de8c93fed22
Diffstat (limited to 'examples/examples.qbs')
| -rw-r--r-- | examples/examples.qbs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/examples.qbs b/examples/examples.qbs index d11b4a8a6..ff4534895 100644 --- a/examples/examples.qbs +++ b/examples/examples.qbs @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing ** ** This file is part of the examples of the Qt Build Suite. ** @@ -16,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) nor the names ** of its contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** |