diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-02-07 11:58:36 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-02-07 13:03:32 +0000 |
| commit | a40723c97aeaa7c03c96044bf2a04b3ed6df1d69 (patch) | |
| tree | 4050a4ea9919ced3ef1691566e6bbc63891047b4 /examples/qt3d/geometry/geometry.cpp | |
| parent | a92ad1a2b363e18fc8a1ea3660482d2d1adfd67d (diff) | |
| parent | d3338a9f7fcac109d7bc7f600d5974ff333782ad (diff) | |
Merge branch 'master' into newapi
Conflicts:
src/threed/scene_ai/qailoader.cpp
src/threed/scene_ai/qailoader_p.h
src/threed/scene_ai/qaiscene.h
src/threed/scene_ai/scene_ai.pri
Change-Id: I4132b51ddddb43319a7fc1b4b9a8df692dc22411
Diffstat (limited to 'examples/qt3d/geometry/geometry.cpp')
| -rw-r--r-- | examples/qt3d/geometry/geometry.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/qt3d/geometry/geometry.cpp b/examples/qt3d/geometry/geometry.cpp index 98e8e25cf..b231f77e4 100644 --- a/examples/qt3d/geometry/geometry.cpp +++ b/examples/qt3d/geometry/geometry.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation 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. +** * Neither the name of Digia Plc 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. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |