summaryrefslogtreecommitdiff
path: root/include/X11
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:42 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:42 +0000
commitfb768609ea31ca228c1d97a997bbcb62a496984b (patch)
tree50731fff7a4af82c16152ec82b5bc832621a52c5 /include/X11
parent9fb403503248fea923533300380cfc4bbb45823a (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'include/X11')
-rw-r--r--include/X11/fonts/bdfint.h2
-rw-r--r--include/X11/fonts/bitmap.h2
-rw-r--r--include/X11/fonts/bufio.h2
-rw-r--r--include/X11/fonts/fntfil.h2
-rw-r--r--include/X11/fonts/fntfilio.h2
-rw-r--r--include/X11/fonts/fntfilst.h2
-rw-r--r--include/X11/fonts/fontencc.h2
-rw-r--r--include/X11/fonts/fontmisc.h2
-rw-r--r--include/X11/fonts/fontmod.h2
-rw-r--r--include/X11/fonts/fontutil.h2
-rw-r--r--include/X11/fonts/fontxlfd.h2
-rw-r--r--include/X11/fonts/pcf.h2
12 files changed, 12 insertions, 12 deletions
diff --git a/include/X11/fonts/bdfint.h b/include/X11/fonts/bdfint.h
index c389bfb..d41c4a5 100644
--- a/include/X11/fonts/bdfint.h
+++ b/include/X11/fonts/bdfint.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.5 2001/12/14 19:56:45 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */
#ifndef BDFINT_H
#define BDFINT_H
diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h
index 29989e3..b5df964 100644
--- a/include/X11/fonts/bitmap.h
+++ b/include/X11/fonts/bitmap.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/bitmap.h,v 1.10 2001/12/14 19:56:53 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/bufio.h b/include/X11/fonts/bufio.h
index 402685f..da90064 100644
--- a/include/X11/fonts/bufio.h
+++ b/include/X11/fonts/bufio.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/bufio.h,v 1.7 2001/12/14 19:56:53 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Exp $ */
#ifndef ___BUFIO_H___
#define ___BUFIO_H___ 1
diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h
index a8d9780..80ec872 100644
--- a/include/X11/fonts/fntfil.h
+++ b/include/X11/fonts/fntfil.h
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fntfil.h,v 1.10 2002/12/09 17:30:00 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fntfil.h,v 1.9 2001/12/14 19:56:54 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fntfilio.h b/include/X11/fonts/fntfilio.h
index 1044da0..30a95c5 100644
--- a/include/X11/fonts/fntfilio.h
+++ b/include/X11/fonts/fntfilio.h
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.7 2001/12/14 19:56:54 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.6 2001/10/31 22:50:26 tsi Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h
index 8be46f2..c037267 100644
--- a/include/X11/fonts/fntfilst.h
+++ b/include/X11/fonts/fntfilst.h
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.9 2002/12/10 22:23:52 tsi Exp $ */
+/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.8 2002/12/09 17:30:00 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fontencc.h b/include/X11/fonts/fontencc.h
index 8ed1d33..51e0e14 100644
--- a/include/X11/fonts/fontencc.h
+++ b/include/X11/fonts/fontencc.h
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/lib/font/include/fontencc.h,v 1.1 2001/08/16 14:33:47 dawes Exp $ */
+/* $XFree86$ */
/* Binary compatibility entry points. */
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h
index e6f2540..b7e3590 100644
--- a/include/X11/fonts/fontmisc.h
+++ b/include/X11/fonts/fontmisc.h
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.17 2003/09/13 21:33:02 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fontmod.h b/include/X11/fonts/fontmod.h
index 64bf757..42d277f 100644
--- a/include/X11/fonts/fontmod.h
+++ b/include/X11/fonts/fontmod.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/include/fontmod.h,v 1.3 1998/12/13 05:32:33 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontmod.h,v 1.2 1998/07/25 06:57:09 dawes Exp $ */
#ifndef _FONTMOD_H_
#define _FONTMOD_H_
diff --git a/include/X11/fonts/fontutil.h b/include/X11/fonts/fontutil.h
index 7d3cfe9..daa8815 100644
--- a/include/X11/fonts/fontutil.h
+++ b/include/X11/fonts/fontutil.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/include/fontutil.h,v 1.2 1999/08/21 13:48:06 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontutil.h,v 1.1 1999/03/14 11:17:49 dawes Exp $ */
#ifndef _FONTUTIL_H_
#define _FONTUTIL_H_
diff --git a/include/X11/fonts/fontxlfd.h b/include/X11/fonts/fontxlfd.h
index 49769bc..e9a12d2 100644
--- a/include/X11/fonts/fontxlfd.h
+++ b/include/X11/fonts/fontxlfd.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.6 2001/12/14 19:56:55 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.5 2001/01/17 19:43:32 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/pcf.h b/include/X11/fonts/pcf.h
index c627bf8..33b0cef 100644
--- a/include/X11/fonts/pcf.h
+++ b/include/X11/fonts/pcf.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.5 2003/11/18 01:17:04 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium