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 /mfb/mfbimage.c | |
parent | 1d31ed778284082e1060bff63317c94581d9eb9b (diff) | |
parent | 0aaac95b0d12089b256c97f6ff955c8c229ae095 (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
Diffstat (limited to 'mfb/mfbimage.c')
-rw-r--r-- | mfb/mfbimage.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index e2d2438c5..8861865a6 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbimage.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> |