diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-08-12 15:31:10 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-08-12 15:31:10 +0930 |
| commit | f367285fd5825e0adc271982a529c9904ad65c89 (patch) | |
| tree | 4e7081da773c51cc9448cefe17c2c3639f33ad6d /record | |
| parent | b1272eefd9a3e340d65c14903f337747ec82d021 (diff) | |
| parent | ff4bd3addb48df3eacc4b121cc249a7f38eb981a (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xi/exevents.c
dix/devices.c
dix/getevents.c
include/dix.h
mi/mieq.c
Diffstat (limited to 'record')
| -rw-r--r-- | record/set.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/record/set.h b/record/set.h index f156bf8dc..3246a16ed 100644 --- a/record/set.h +++ b/record/set.h @@ -1,4 +1,3 @@ - /* Copyright 1995, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ /* A Set Abstract Data Type (ADT) for the RECORD Extension |