Merge branch 'master' into mpx

Conflicts:

	Xi/exevents.c
	dix/devices.c
	dix/getevents.c
	include/dix.h
	mi/mieq.c

6 files changed, 0 insertions, 12 deletions

diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 2b357066b..0c2b0d282 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2006 Sun Microsystems
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/region.c b/xfixes/region.c
index 91e9fc9c1..d4316be78 100755
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2003 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index ab75619e8..8d66843d9 100755
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2002 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/select.c b/xfixes/select.c
index f0a9f2f4f..c0076801d 100755
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2002 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h
index 0f1e3b070..81dd83daf 100755
--- a/xfixes/xfixes.h
+++ b/xfixes/xfixes.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2002 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 7f3b119b7..48927ae0f 100755
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright © 2006 Sun Microsystems
  *
  * Permission to use, copy, modify, distribute, and sell this software and its