Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: third_party/yasm/patched-yasm/BSD.txt

Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/yasm/patched-yasm/ABOUT-NLS ('k') | third_party/yasm/patched-yasm/COPYING » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Redistribution and use in source and binary forms, with or without 1 Redistribution and use in source and binary forms, with or without
2 modification, are permitted provided that the following conditions 2 modification, are permitted provided that the following conditions
3 are met: 3 are met:
4 1. Redistributions of source code must retain the above copyright 4 1. Redistributions of source code must retain the above copyright
5 notice, this list of conditions and the following disclaimer. 5 notice, this list of conditions and the following disclaimer.
6 2. Redistributions in binary form must reproduce the above copyright 6 2. Redistributions in binary form must reproduce the above copyright
7 notice, this list of conditions and the following disclaimer in the 7 notice, this list of conditions and the following disclaimer in the
8 documentation and/or other materials provided with the distribution. 8 documentation and/or other materials provided with the distribution.
9 9
10 THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS'' 10 THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
(...skipping 24 matching lines...) Expand all
35 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 35 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
36 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 36 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
37 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE 37 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
38 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 38 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
39 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 39 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
40 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 40 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
41 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 41 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
42 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 42 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
43 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 43 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
44 POSSIBILITY OF SUCH DAMAGE. 44 POSSIBILITY OF SUCH DAMAGE.
45 -------------------------------------------------------------------------------
46 NASM is now licensed under the 2-clause BSD license, also known as the
47 simplified BSD license.
48
49 Copyright 1996-2009 the NASM Authors - All rights reserved.
50
51 Redistribution and use in source and binary forms, with or without
52 modification, are permitted provided that the following
53 conditions are met:
54
55 * Redistributions of source code must retain the above copyright
56 notice, this list of conditions and the following disclaimer.
57 * Redistributions in binary form must reproduce the above
58 copyright notice, this list of conditions and the following
59 disclaimer in the documentation and/or other materials provided
60 with the distribution.
61
62 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
63 CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
64 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
65 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
66 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
67 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
68 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
69 NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
70 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
71 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
72 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
73 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
74 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OLDNEW
« no previous file with comments | « third_party/yasm/patched-yasm/ABOUT-NLS ('k') | third_party/yasm/patched-yasm/COPYING » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698