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 /include/window.h | |
| 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 'include/window.h')
| -rw-r--r-- | include/window.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/window.h b/include/window.h index 707272a6e..4913758b5 100644 --- a/include/window.h +++ b/include/window.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef WINDOW_H #define WINDOW_H |