From c9985d065b2792cb139cb3b03c8d53952987c108 Mon Sep 17 00:00:00 2001 From: Tomi Paananen Date: Fri, 25 Apr 2014 13:55:56 +0300 Subject: [PATCH] Updated copyright and license information. --- Licence.txt | 33 +++++++++++++++++++-------------- README.md | 2 +- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Licence.txt b/Licence.txt index 7c91bfc..ae4758b 100644 --- a/Licence.txt +++ b/Licence.txt @@ -1,21 +1,24 @@ -Copyright © 2012-2013 Nokia Corporation. All rights reserved. +Copyright © 2012-2014 Microsoft Mobile Oy. All rights reserved. + +Microsoft is a registered trademark of Microsoft Corporation. Nokia and HERE are +trademarks and/or registered trademarks of Nokia Corporation. Other product and +company names mentioned herein may be trademarks or trade names of their +respective owners. -Nokia, Nokia Developer, and HERE are trademarks and/or registered trademarks of -Nokia Corporation. Other product and company names mentioned herein may be -trademarks or trade names of their respective owners. License + Subject to the conditions below, you may use, copy, modify and/or merge copies -of this software and associated content and documentation files (the “Software”) +of this software and associated content and documentation files (the ”Software”) to test, develop, publish, distribute, sub-license and/or sell new software -derived from or incorporating the Software, solely in connection with Nokia -devices. Some of the documentation, content and/or software maybe licensed under -open source software or other licenses. To the extent such documentation, -content and/or software are included, licenses and/or other terms and conditions -shall apply in addition and/or instead of this notice. The exact terms of the -licenses, disclaimers, acknowledgements and notices are reproduced in the -materials provided, or in other obvious locations. No other license to any other -intellectual property rights is granted herein. +derived from or incorporating the Software, solely in connection with Microsoft +Mobile devices (however branded). Some of the documentation, content and/or +software may be licensed under open source software or other licenses. To the +extent such documentation, content and/or software are included, those licenses +and/or other terms and conditions shall apply in addition and/or instead of this +notice. The exact terms of the licenses, disclaimers, acknowledgements and +notices are reproduced in the materials provided, or in other obvious locations. +No other license to any other intellectual property rights is granted herein. This file, unmodified, shall be included with all copies or substantial portions of the Software that are distributed in source code form. @@ -26,7 +29,9 @@ from or incorporating the Software. Any person dealing with the Software shall not misrepresent the source of the Software. + Disclaimer + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUALITY AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -36,5 +41,5 @@ EXEMPLARY AND/ OR INCIDENTAL DAMAGES) OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Nokia Corporation retains the right to make changes to this document at any +Microsoft Mobile Oy retains the right to make changes to this document at any time, without notice. diff --git a/README.md b/README.md index ec896c3..e8774ad 100644 --- a/README.md +++ b/README.md @@ -139,4 +139,4 @@ Very simple example for showing how to run position tracking in the background. --- -*Copyright (c) 2012-2013 Nokia Corporation. All rights reserved.* +*Copyright (c) 2012-2014 Microsoft Mobile. All rights reserved.*