From cfe9f4be6f2c5529d42686fa67650bae43395e38 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 7 Nov 2012 11:51:04 +0100 Subject: Update to new license format Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6 Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04 Reviewed-by: Lars Knoll --- examples/sfw-notes/main.cpp | 8 ++++---- examples/sfw-notes/sfwnotes.cpp | 8 ++++---- examples/sfw-notes/sfwnotes.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'examples/sfw-notes') diff --git a/examples/sfw-notes/main.cpp b/examples/sfw-notes/main.cpp index b143582d27..99a928c254 100644 --- a/examples/sfw-notes/main.cpp +++ b/examples/sfw-notes/main.cpp @@ -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 diff --git a/examples/sfw-notes/sfwnotes.cpp b/examples/sfw-notes/sfwnotes.cpp index 5f0a2fc01f..6d3ba2fcf2 100644 --- a/examples/sfw-notes/sfwnotes.cpp +++ b/examples/sfw-notes/sfwnotes.cpp @@ -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 diff --git a/examples/sfw-notes/sfwnotes.h b/examples/sfw-notes/sfwnotes.h index b43f0e8c3b..7a4bcd246d 100644 --- a/examples/sfw-notes/sfwnotes.h +++ b/examples/sfw-notes/sfwnotes.h @@ -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 -- cgit v1.2.3