diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-21 19:05:41 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 19:05:41 -0400 |
| commit | 7465010d59ec435bd00b738f0cef766b352dc7eb (patch) | |
| tree | b87bf4909a05e86ab8899b798ff853f20e64630c /include/os.h | |
| parent | 1d31ed778284082e1060bff63317c94581d9eb9b (diff) | |
| parent | 0aaac95b0d12089b256c97f6ff955c8c229ae095 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
Diffstat (limited to 'include/os.h')
| -rw-r--r-- | include/os.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/os.h b/include/os.h index d459e9e2f..fbe1592a1 100644 --- a/include/os.h +++ b/include/os.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: os.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef OS_H #define OS_H |