diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /xorg-server/hw/xfree86/parser/xf86tokens.h | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'xorg-server/hw/xfree86/parser/xf86tokens.h')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/xf86tokens.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h index abcafcf8e..a9856064e 100644 --- a/xorg-server/hw/xfree86/parser/xf86tokens.h +++ b/xorg-server/hw/xfree86/parser/xf86tokens.h @@ -207,8 +207,6 @@ typedef enum { XKBLAYOUT, XKBVARIANT, XKBOPTIONS, - /* The next two have become ServerFlags options */ - VTSYSREQ, /* Obsolete keyboard tokens */ SERVERNUM, LEFTALT, |