Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in licenses: intel-psb
Date: Thu, 06 Feb 2014 07:42:24
Message-Id: 20140206074220.9087F2004C@flycatcher.gentoo.org
1 ulm 14/02/06 07:42:20
2
3 Modified: intel-psb
4 Log:
5 QA: Fix file encoding.
6
7 Revision Changes Path
8 1.2 licenses/intel-psb
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/intel-psb?rev=1.2&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/intel-psb?rev=1.2&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/intel-psb?r1=1.1&r2=1.2
13
14 Index: intel-psb
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/licenses/intel-psb,v
17 retrieving revision 1.1
18 retrieving revision 1.2
19 diff -u -r1.1 -r1.2
20 --- intel-psb 14 Sep 2009 08:51:36 -0000 1.1
21 +++ intel-psb 6 Feb 2014 07:42:20 -0000 1.2
22 @@ -1,15 +1,15 @@
23 License:
24
25 -Copyright (c) 2008, Intel Corporation.
26 -Portions (c), Imagination Technologies, Ltd.
27 +Copyright (c) 2008, Intel Corporation.
28 +Portions (c), Imagination Technologies, Ltd.
29 All rights reserved.
30
31 ***********************
32 Redistribution and Use
33 -***********************
34 +***********************
35
36 Redistribution and use in binary form, without modification, of the
37 -software code provided with this license (“Software?, are permitted
38 +software code provided with this license (“Software”), are permitted
39 provided that the following conditions are met:
40
41 * Redistributions must reproduce the above copyright notice and this
42 @@ -32,11 +32,11 @@
43
44 ***********************
45 Limited Patent License
46 -***********************
47 +***********************
48
49 Intel Corporation grants a world-wide, royalty-free, non-exclusive
50 license under patents it now or hereafter owns or controls to make,
51 -have made, use, import, offer to sell and sell (“Utilize? the
52 +have made, use, import, offer to sell and sell (“Utilize”) the
53 Software, but solely to the extent that any such patent is necessary
54 to Utilize the Software alone. The patent license shall not apply to
55 any combinations which include the Software. No hardware per se is
56 @@ -53,7 +53,7 @@
57
58 ***********
59 DISCLAIMER
60 -***********
61 +***********
62
63 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
64 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT