diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-01-16 17:52:29 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-01-16 17:53:41 +0100 |
| commit | 5b250d497fd798c476765b22a2906e1c0ff1e432 (patch) | |
| tree | fd4215ca375cc2402e536bf670c2977cf64ae2ef /examples/opengl/cube | |
| parent | 2c52e9a5c1d6ef6cbf4577430e14027375465c96 (diff) | |
| parent | 7a0099183a1c107126bda3b59a47651aac612426 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I2d358b912f1055ee6021d13de2f66fd459aaa355
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 c05dde56f8..3c5fe4fe8c 100644 --- a/examples/opengl/cube/geometryengine.cpp +++ b/examples/opengl/cube/geometryengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/opengl/cube/geometryengine.h b/examples/opengl/cube/geometryengine.h index e071ef6202..ddb34fb3d3 100644 --- a/examples/opengl/cube/geometryengine.h +++ b/examples/opengl/cube/geometryengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/opengl/cube/main.cpp b/examples/opengl/cube/main.cpp index ef6efdc4dc..bdf1a7161f 100644 --- a/examples/opengl/cube/main.cpp +++ b/examples/opengl/cube/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index c095888f98..60bef9e54e 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h index eb509d0d40..90c1bd11cc 100644 --- a/examples/opengl/cube/mainwidget.h +++ b/examples/opengl/cube/mainwidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |