From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 18:43:06 +0000 (+0000)
Subject: Merging XORG-CURRENT into trunk
X-Git-Tag: XACE-SELINUX-MERGE
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2FXORG-6_8_99_902;p=platform%2Fupstream%2Finputproto.git

Merging XORG-CURRENT into trunk
---

diff --git a/XI.h b/XI.h
index ea162fa..c710e0a 100644
--- a/XI.h
+++ b/XI.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/include/extensions/XI.h,v 1.5 2001/12/14 19:53:28 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */
 
 /* Definitions used by the server, library and client */
 
diff --git a/XInput.h b/XInput.h
index 0abd5a7..ee44105 100644
--- a/XInput.h
+++ b/XInput.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/include/extensions/XInput.h,v 1.4 2003/11/17 22:20:02 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XInput.h,v 1.3 2001/12/14 19:53:28 dawes Exp $ */
 
 /* Definitions used by the library and client */
 
diff --git a/XIproto.h b/XIproto.h
index 0dbe4d2..1da0248 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/include/extensions/XIproto.h,v 1.5 2001/12/14 19:53:28 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XIproto.h,v 1.4 2001/01/17 17:53:17 dawes Exp $ */
 
 #ifndef _XIPROTO_H
 #define _XIPROTO_H