diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
| commit | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch) | |
| tree | 8239768e506a03837019c4f02c8ab949c04a0818 /xorg-server/configure.ac | |
| parent | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff) | |
| parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
| download | vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2 vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
Conflicts:
libXinerama/src/Xinerama.c
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 2f4edee54..6c4a609d7 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.14.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2013-11-14" -RELEASE_NAME="English Breakfast" +AC_INIT([xorg-server], 1.14.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2013-11-23" +RELEASE_NAME="Apple Pie" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_USE_SYSTEM_EXTENSIONS |