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 /libXext/man/XShm.man | |
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 'libXext/man/XShm.man')
-rw-r--r-- | libXext/man/XShm.man | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXext/man/XShm.man b/libXext/man/XShm.man index da5150701..793680090 100644 --- a/libXext/man/XShm.man +++ b/libXext/man/XShm.man @@ -23,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the
.\" X Consortium.
.\"
-.\" Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+.\" Copyright (c) 2006, 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"),
|