diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:24 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:24 +0000 |
| commit | c4ff56f0cec660af6958f65300d518fdbc2fd5b2 (patch) | |
| tree | 822daf717a13c8c272995c3e676fd94c857d7037 | |
| parent | af70611ed21768981f218c7e395da6bc32dd5cee (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
| -rw-r--r-- | Xinerama.h | 1 | ||||
| -rw-r--r-- | panoramiXext.h | 2 | ||||
| -rw-r--r-- | panoramiXproto.h | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,5 @@ /* $XdotOrg: xc/include/extensions/Xinerama.h,v 1.1.4.1 2003/12/18 22:59:34 kaleb Exp $ */ +/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */ /* Copyright 2003 The Open Group diff --git a/panoramiXext.h b/panoramiXext.h index 3342e38..ad2f7e4 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -26,7 +26,7 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/panoramiXproto.h b/panoramiXproto.h index fe3826e..6b27c56 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ |