diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 22:12:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 22:12:54 +0100 |
commit | 7df08a8b63c8fc861a5e927eabf2405e1a2a01e1 (patch) | |
tree | 495ff2934465b02b01fc2ff694687344c909bf62 /examples/opengl/cube | |
parent | 06e4b1cff4c469d2fc3afbfe7a6b1954fedc90ff (diff) | |
parent | c608ec825410a9287f544a2ae3ce8154424e767d (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'examples/opengl/cube')
-rw-r--r-- | examples/opengl/cube/geometryengine.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/cube/geometryengine.h | 2 | ||||
-rw-r--r-- | examples/opengl/cube/main.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/cube/mainwidget.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/cube/mainwidget.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/opengl/cube/geometryengine.cpp b/examples/opengl/cube/geometryengine.cpp index 277a6e9cfc..d573ade1e7 100644 --- a/examples/opengl/cube/geometryengine.cpp +++ b/examples/opengl/cube/geometryengine.cpp @@ -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/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/examples/opengl/cube/geometryengine.h b/examples/opengl/cube/geometryengine.h index 6a15c3ce03..fe90c436c6 100644 --- a/examples/opengl/cube/geometryengine.h +++ b/examples/opengl/cube/geometryengine.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/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/examples/opengl/cube/main.cpp b/examples/opengl/cube/main.cpp index fdae1caa16..715d46dde7 100644 --- a/examples/opengl/cube/main.cpp +++ b/examples/opengl/cube/main.cpp @@ -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/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index 4a42eca159..0ba859c6b8 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -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/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h index cebfb30999..2e6b6bcc77 100644 --- a/examples/opengl/cube/mainwidget.h +++ b/examples/opengl/cube/mainwidget.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/legal ** ** This file is part of the QtCore module of the Qt Toolkit. |