diff options
author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-10 10:37:59 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-10 10:37:59 -0700 |
commit | c2535f67923bde0bfb0e72363467110806e2f40f (patch) | |
tree | 86e27df1edccb7318a378a25c1a74c212d10ce85 /dix/resource.c | |
parent | c0cb8d1fb80540e093da54da3ee2f55bdf139274 (diff) | |
parent | db82e12fac5eaa16a39fc1bd0bc31ad95089dc95 (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'dix/resource.c')
-rw-r--r-- | dix/resource.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/dix/resource.c b/dix/resource.c index abe79dee6..ca739ed16 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -73,8 +73,6 @@ Equipment Corporation. ******************************************************************/ -/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* $XdotOrg: xserver/xorg/dix/resource.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */ /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ /* Routines to manage various kinds of resources: @@ -99,7 +97,6 @@ Equipment Corporation. * 1, and an otherwise arbitrary ID in the low 22 bits, we can create a * resource "owned" by the client. */ -/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */ #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H |