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 /include/resource.h | |
| parent | c0cb8d1fb80540e093da54da3ee2f55bdf139274 (diff) | |
| parent | db82e12fac5eaa16a39fc1bd0bc31ad95089dc95 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'include/resource.h')
| -rw-r--r-- | include/resource.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/resource.h b/include/resource.h index c08998c9f..45164209c 100644 --- a/include/resource.h +++ b/include/resource.h @@ -1,4 +1,3 @@ -/* $Xorg: resource.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */ #ifndef RESOURCE_H #define RESOURCE_H 1 |