diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-13 10:11:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-13 10:11:17 +0200 |
| commit | f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1 (patch) | |
| tree | 921a5a742930124e7bd7e9a7e73f6029bd74338d /xorg-server | |
| parent | ec4051f308e8e84146e0ecc39b6d228e500e9636 (diff) | |
| parent | 9ddf44af81782451cee798e06749ce3067a14a41 (diff) | |
| download | vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.tar.gz vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.tar.bz2 vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/configure.ac | 7 | ||||
| -rw-r--r-- | xorg-server/include/Makefile.am | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/level5 | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index dc79e4820..e126355c6 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,8 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.12.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2012-07-25" +AC_INIT([xorg-server], 1.12.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2012-08-07" +RELEASE_NAME="Sweating Aardvark" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -776,7 +777,7 @@ DRI2PROTO="dri2proto >= 2.8" XINERAMAPROTO="xineramaproto" BIGFONTPROTO="xf86bigfontproto >= 1.2.0" DGAPROTO="xf86dgaproto >= 2.0.99.1" -GLPROTO="glproto >= 1.4.15" +GLPROTO="glproto >= 1.4.16" DMXPROTO="dmxproto >= 2.2.99.1" VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" WINDOWSWMPROTO="windowswmproto" diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am index 972f403ce..33116f284 100644 --- a/xorg-server/include/Makefile.am +++ b/xorg-server/include/Makefile.am @@ -26,6 +26,7 @@ sdk_HEADERS = \ gc.h \ gcstruct.h \ globals.h \ + glx_extinit.h \ input.h \ inputstr.h \ list.h \ diff --git a/xorg-server/xkeyboard-config/types/level5 b/xorg-server/xkeyboard-config/types/level5 index f9ba5b28a..672f0a1b3 100644 --- a/xorg-server/xkeyboard-config/types/level5 +++ b/xorg-server/xkeyboard-config/types/level5 @@ -188,6 +188,7 @@ partial default xkb_types "default" { map[LevelFive] = Level5; map[Shift+LevelFive] = Level6; map[Lock+LevelFive] = Level6; + map[Lock+Shift+LevelFive] = Level6; map[LevelThree+LevelFive] = Level7; map[Shift+LevelThree+LevelFive] = Level8; map[Lock+LevelThree+LevelFive] = Level7; |