Merge branch 'master' into mpx

Conflicts: Xi/exevents.c dix/devices.c dix/getevents.c include/dix.h mi/mieq.c
2007-08-12 15:31:10 +09:30
parent b1272eefd9 ff4bd3addb
commit f367285fd5
755 changed files with 16262 additions and 5257 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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