diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-26 21:23:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-26 21:23:55 +0000 |
| commit | 8f1afd266a69c5454dccf130e8522575c7aecae8 (patch) | |
| tree | d647da44b8f803428e3217d54bd42d89e72fa803 /X11/COPYING | |
| parent | cc5b4c212b7c88026e8ebc5f3d82473149a040c5 (diff) | |
| parent | f28d4c94798d88757227b8c517a05a6ca354dc6f (diff) | |
| download | vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.gz vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.bz2 vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'X11/COPYING')
| -rw-r--r-- | X11/COPYING | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/X11/COPYING b/X11/COPYING index e514d3609..d59a5bd8f 100644 --- a/X11/COPYING +++ b/X11/COPYING @@ -1,4 +1,4 @@ -Copyright © 1991 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -19,6 +19,7 @@ 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. + Copyright 1987, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its |