aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/XKeysymDB
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/XKeysymDB
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/XKeysymDB')
-rw-r--r--libX11/src/XKeysymDB18
1 files changed, 9 insertions, 9 deletions
diff --git a/libX11/src/XKeysymDB b/libX11/src/XKeysymDB
index 7091faf28..5e668820b 100644
--- a/libX11/src/XKeysymDB
+++ b/libX11/src/XKeysymDB
@@ -332,27 +332,27 @@ XF86MailForward :1008FF90
XF86Pictures :1008FF91
XF86Music :1008FF92
XF86Battery :1008FF93
-XF86Bluetooth :1008FF94
+XF86Bluetooth :1008FF94
XF86WLAN :1008FF95
-XF86UWB :1008FF96
+XF86UWB :1008FF96
XF86AudioForward :1008FF97
-XF86AudioRepeat :1008FF98
+XF86AudioRepeat :1008FF98
XF86AudioRandomPlay :1008FF99
-XF86Subtitle :1008FF9A
+XF86Subtitle :1008FF9A
XF86AudioCycleTrack :1008FF9B
-XF86CycleAngle :1008FF9C
-XF86FrameBack :1008FF9D
+XF86CycleAngle :1008FF9C
+XF86FrameBack :1008FF9D
XF86FrameForward :1008FF9E
XF86Time :1008FF9F
XF86Select :1008FFA0
XF86View :1008FFA1
XF86TopMenu :1008FFA2
-XF86Red :1008FFA3
+XF86Red :1008FFA3
XF86Green :1008FFA4
XF86Yellow :1008FFA5
-XF86Blue :1008FFA6
+XF86Blue :1008FFA6
XF86Suspend :1008FFA7
-XF86Hibernate :1008FFA8
+XF86Hibernate :1008FFA8
! XFree86 special action keys
XF86_Switch_VT_1 :1008FE01