diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-29 06:41:31 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-29 06:41:31 +0000 |
| commit | 5c8222f5274c5d56e260d72192d536a7228cfbc8 (patch) | |
| tree | b6b265decf4a31eed6fb5cb2939bfb69365b3cac /libXinerama | |
| parent | a769e525374f80f0650699a2c97ad020cc76ea6d (diff) | |
| parent | 3eee9271d2345cb54c1778629ba3cf3b804c2671 (diff) | |
| download | vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.gz vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.bz2 vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libXinerama')
| -rw-r--r-- | libXinerama/COPYING | 2 | ||||
| -rw-r--r-- | libXinerama/configure.ac | 4 | ||||
| -rw-r--r-- | libXinerama/man/Makefile.am | 2 | ||||
| -rw-r--r-- | libXinerama/man/Xinerama.man | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/libXinerama/COPYING b/libXinerama/COPYING index 2abdec8cb..c9816b684 100644 --- a/libXinerama/COPYING +++ b/libXinerama/COPYING @@ -1,4 +1,4 @@ -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/configure.ac b/libXinerama/configure.ac index f03c4defa..0dec68bec 100644 --- a/libXinerama/configure.ac +++ b/libXinerama/configure.ac @@ -22,7 +22,9 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60])
-AC_INIT(libXinerama, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
+AC_INIT([libXinerama], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXinerama])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
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"),
|