summaryrefslogtreecommitdiff
path: root/Copying_BSD.txt
diff options
context:
space:
mode:
authorMateusz Łukasik <mati75@linuxmint.pl>2015-04-25 16:17:41 +0200
committerMateusz Łukasik <mati75@linuxmint.pl>2015-04-25 16:17:41 +0200
commit45ee5ac6dc2159352596ce8e8ec744e0c864d492 (patch)
tree55ca90fd4a0d5c0eae188c5919510b6b0d2e3c5d /Copying_BSD.txt
parenta35c74c509f107094fd81cee8df109b652063969 (diff)
Imported Upstream version 14.9.0.6690~ds0
Diffstat (limited to 'Copying_BSD.txt')
-rw-r--r--Copying_BSD.txt22
1 files changed, 12 insertions, 10 deletions
diff --git a/Copying_BSD.txt b/Copying_BSD.txt
index 8440de7..65f8fdb 100644
--- a/Copying_BSD.txt
+++ b/Copying_BSD.txt
@@ -1,11 +1,11 @@
-This is the license of QtLockedFile:
+This is the license of the QtSingleApplication files (src/qtsingleapplication):
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
+/****************************************************************************
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
-** This file is part of a Qt Solutions component.
+** This file is part of the Qt Solutions component.
**
** You may use this file under the terms of the BSD license as follows:
**
@@ -18,10 +18,10 @@ This is the license of QtLockedFile:
** 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
@@ -34,4 +34,6 @@ This is the license of QtLockedFile:
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-
+**
+**
+****************************************************************************/