xserver: Branch 'master'

[Adam Jackson]

 dix/CHANGES     |   17 -----------------
 dix/Makefile.am |    2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 1c1a6e965da412e767ad8bc15a5362116d64c6b0
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Sep 22 22:09:19 2008 -0400

    Remove an utterly, utterly ancient changelog.
    
    Wow.

diff --git a/dix/CHANGES b/dix/CHANGES
deleted file mode 100644
index d8fb7c3..0000000
--- a/dix/CHANGES
+++ /dev/null
@@ -1,17 +0,0 @@
-The following changes have been made to this directory since R3 (for
-a full description, see doc/Server/r4.tbl.ms):
-
-     o  Windows restructured (memory reduction, devPrivates and speedups)
-     o  GCs restructured (memory reduction, devPrivates and wrappers)
-     o  Screens restructured (window ops merged in, devPrivates)
-     o  Pixmaps restructured (drawable changes mostly)
-     o  Cursors restructured (shares glyph bits now)
-     o  Visuals restructured (screen index removed, fields rearranged)
-     o  Devices restructured (input extension changes)
-     o  Out of memory changes.  Many interfaces now return OutOfMemory
-     	status.
-     o  Synchronous grab code rewritten.  Should conform to our
-     	understanding of the protocol now.  Be careful when time
-	stamping events (don't allow time to run backwards).
-     o  Resource types redesigned and rewritten.
-     o  Internal fake color allocation routine for software cursors.
diff --git a/dix/Makefile.am b/dix/Makefile.am
index 182311e..bdc2d45 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -37,7 +37,7 @@ libdix_la_SOURCES = 	\
 	tables.c	\
 	window.c
 
-EXTRA_DIST = buildatoms BuiltInAtoms CHANGES Xserver.d Xserver-dtrace.h.in
+EXTRA_DIST = buildatoms BuiltInAtoms Xserver.d Xserver-dtrace.h.in
 
 # Install list of protocol names
 miscconfigdir = $(SERVER_MISC_CONFIG_PATH)