aboutsummaryrefslogtreecommitdiff
path: root/libXinerama/man
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-10-29 06:41:31 +0000
committermarha <marha@users.sourceforge.net>2010-10-29 06:41:31 +0000
commit5c8222f5274c5d56e260d72192d536a7228cfbc8 (patch)
treeb6b265decf4a31eed6fb5cb2939bfb69365b3cac /libXinerama/man
parenta769e525374f80f0650699a2c97ad020cc76ea6d (diff)
parent3eee9271d2345cb54c1778629ba3cf3b804c2671 (diff)
downloadvcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.gz
vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.bz2
vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.zip
svn merge ^/branches/released .
Diffstat (limited to 'libXinerama/man')
-rw-r--r--libXinerama/man/Makefile.am2
-rw-r--r--libXinerama/man/Xinerama.man2
2 files changed, 2 insertions, 2 deletions
diff --git a/libXinerama/man/Makefile.am b/libXinerama/man/Makefile.am
index 312a14b93..d220ff5fd 100644
--- a/libXinerama/man/Makefile.am
+++ b/libXinerama/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright © 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2007, 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"),
diff --git a/libXinerama/man/Xinerama.man b/libXinerama/man/Xinerama.man
index 89524eb8d..a68fd943f 100644
--- a/libXinerama/man/Xinerama.man
+++ b/libXinerama/man/Xinerama.man
@@ -1,5 +1,5 @@
.\"
-.\" Copyright © 2007 Sun Microsystems, Inc. All rights reserved.
+.\" Copyright (c) 2007, 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"),