Changeset 651 for trunk/src/opengl/util

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/opengl/util/fragmentprograms_p.h (modified) (1 diff)
• src/opengl/util/generator.cpp (modified) (2 diffs)
• src/opengl/util/glsl_to_include.sh (modified) (1 diff)

trunk/src/opengl/util/fragmentprograms_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/opengl/util/generator.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -288 +288 @@
     out << "/****************************************************************************\n"
            "**\n"
-           "** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
+           "** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).\n"
            "** All rights reserved.\n"
            "** Contact: Nokia Corporation ([email protected])\n"

trunk/src/opengl/util/glsl_to_include.sh

@@ -2 +2 @@
 #############################################################################
 ##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ## Contact: Nokia Corporation ([email protected])