| author | mmhunter@s11sru-x01.us.oracle.com |
| Tue, 07 May 2013 10:23:58 -0700 | |
| branch | s11u1-sru |
| changeset 2609 | 0de70984f658 |
| parent 771 | f57a88a76d61 |
| child 1205 | 6c6c27bcf9ac |
| permissions | -rw-r--r-- |
|
771
f57a88a76d61
7161370 Update conflict to version 20100627
Rich Burridge <rich.burridge@oracle.com>
parents:
387
diff
changeset
|
1 |
--------------------- |
|
f57a88a76d61
7161370 Update conflict to version 20100627
Rich Burridge <rich.burridge@oracle.com>
parents:
387
diff
changeset
|
2 |
- conflict 20100627 - |
|
f57a88a76d61
7161370 Update conflict to version 20100627
Rich Burridge <rich.burridge@oracle.com>
parents:
387
diff
changeset
|
3 |
--------------------- |
|
f57a88a76d61
7161370 Update conflict to version 20100627
Rich Burridge <rich.burridge@oracle.com>
parents:
387
diff
changeset
|
4 |
|
|
f57a88a76d61
7161370 Update conflict to version 20100627
Rich Burridge <rich.burridge@oracle.com>
parents:
387
diff
changeset
|
5 |
Oracle Internal Tracking Number 5761 |
|
f57a88a76d61
7161370 Update conflict to version 20100627
Rich Burridge <rich.burridge@oracle.com>
parents:
387
diff
changeset
|
6 |
|
|
f57a88a76d61
7161370 Update conflict to version 20100627
Rich Burridge <rich.burridge@oracle.com>
parents:
387
diff
changeset
|
7 |
Copyright 1995-2004,2010 by Thomas E. Dickey |
|
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
|
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
Permission to use, copy, modify, and distribute this software and its |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
documentation for any purpose and without fee is hereby granted, |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
provided that the above copyright notice appear in all copies and that |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
both that copyright notice and this permission notice appear in |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
supporting documentation, and that the name of the above listed |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
copyright holder(s) not be used in advertising or publicity pertaining |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
to distribution of the software without specific, written prior |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
permission. |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
|
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |