summaryrefslogtreecommitdiff
path: root/dix/atom.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
commit2fb588620030ad393f8500d60e16144d59e4effe (patch)
tree07262cbe15a40e5aeae54f62751260f83243ab79 /dix/atom.c
parent0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'dix/atom.c')
-rw-r--r--dix/atom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/atom.c b/dix/atom.c
index 66c045583..7509f0a24 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.4 2002/02/19 11:09:21 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.3 2001/12/14 19:59:29 dawes Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group