diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
| commit | 0e950715b62dcf30ffbf69831bf932fd348537e5 (patch) | |
| tree | 83fdafc455e9906f029e2e1ad926fb35c98e7be9 /xorg-server/configure.ac | |
| parent | 506537495e6d808f219361a5b270510c752e7a2e (diff) | |
| parent | 3f553aaceddc9b09363c73d9bea40eaea8164fc4 (diff) | |
| download | vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.gz vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.bz2 vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
Conflicts:
fontconfig/src/fcatomic.c
pixman/pixman/pixman-mmx.c
pixman/pixman/pixman-sse2.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/xfixes/cursor.c
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 38ac240df..435a38f15 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,9 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.13.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2012-10-04" -RELEASE_NAME="Horchata" +AC_INIT([xorg-server], 1.13.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2012-12-19" +RELEASE_NAME="Egg Nog" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -788,7 +788,7 @@ XPROTO="xproto >= 7.0.22" RANDRPROTO="randrproto >= 1.4.0" RENDERPROTO="renderproto >= 0.11" XEXTPROTO="xextproto >= 7.1.99" -INPUTPROTO="inputproto >= 2.1.99.6" +INPUTPROTO="inputproto >= 2.2.99.1" KBPROTO="kbproto >= 1.0.3" FONTSPROTO="fontsproto" FIXESPROTO="fixesproto >= 5.0" |