diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-30 10:03:09 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-30 10:03:09 +0000 |
| commit | 3e2f3f105cfe65384d2adeb2bd678850d9be47f9 (patch) | |
| tree | 1c3e43a774683e6e47cbd2293679b7115fbaa3cb /pixman/COPYING | |
| parent | fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (diff) | |
| parent | 57818d0fe4f7cf94279909f03ec11b326b284f1e (diff) | |
| download | vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.gz vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.bz2 vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman/COPYING')
| -rw-r--r-- | pixman/COPYING | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pixman/COPYING b/pixman/COPYING index 48ea58bdd..47c22c370 100644 --- a/pixman/COPYING +++ b/pixman/COPYING @@ -18,7 +18,7 @@ possible. They may also add themselves to the list below. * Copyright 2008 André Tupinambá
* Copyright 2008 Mozilla Corporation
* Copyright 2008 Frederic Plourde
- * Copyright 2009 Sun Microsystems, Inc.
+ * Copyright 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"),
|