diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-05 10:19:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-05 10:19:03 +0200 |
| commit | 9441c8f47bb24faebc885bfc3c5e37f47a3ad984 (patch) | |
| tree | 276b55ded8f63c6bc5041785785ba927f168e077 /libXfont/COPYING | |
| parent | c7b24c70d1e2d558d512665ffa5479e64b36692d (diff) | |
| parent | 6eaea4464631b5d8c1f44a46016163e351028afc (diff) | |
| download | vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.tar.gz vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.tar.bz2 vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/configure.ac
libXfont/doc/fontlib.xml
libXfont/src/bitmap/bitscale.c
libXfont/src/fontfile/decompress.c
Diffstat (limited to 'libXfont/COPYING')
| -rw-r--r-- | libXfont/COPYING | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXfont/COPYING b/libXfont/COPYING index b271bf3c1..d43a6f8b7 100644 --- a/libXfont/COPYING +++ b/libXfont/COPYING @@ -1,5 +1,5 @@ Copyright © 2007 Red Hat, Inc -Copyright © 2008,2009 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 2008, 2009, 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"), |