aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/parser/xf86tokens.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-10-12 21:11:32 +0200
committermarha <marha@users.sourceforge.net>2014-10-12 21:38:35 +0200
commit1a83b8e49a75e2dab63805de25e384e0e38c27ed (patch)
tree5280fe2a1bd2ce227e4bce9ce06134986e181de1 /xorg-server/hw/xfree86/parser/xf86tokens.h
parent4aea4b223604c589828beb1145875a5fbcc41eed (diff)
parent9480392b8817f8bfa79cbc694ff039a73fc0a57f (diff)
downloadvcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.gz
vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.bz2
vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/glsl/glsl_symbol_table.h mesalib/src/mesa/drivers/common/meta_blit.c xorg-server/dix/dispatch.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch_swap.c xorg-server/mi/miexpose.c
Diffstat (limited to 'xorg-server/hw/xfree86/parser/xf86tokens.h')
-rw-r--r--xorg-server/hw/xfree86/parser/xf86tokens.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h
index 5c01ce701..8e15f122a 100644
--- a/xorg-server/hw/xfree86/parser/xf86tokens.h
+++ b/xorg-server/hw/xfree86/parser/xf86tokens.h
@@ -187,7 +187,6 @@ typedef enum {
CHIPREV,
CARD,
BUSID,
- TEXTCLOCKFRQ,
IRQ,
/* Keyboard tokens */