diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
| commit | f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd (patch) | |
| tree | afbeb028495328a2817aedbac7aae484a2c71a83 /X11/configure.ac | |
| parent | bf0cbcc1d00962ef2221cb4ceae87cc5ae737454 (diff) | |
| parent | cbfb19790917d271b8ca6156554b16acc802719f (diff) | |
| download | vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.gz vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.bz2 vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/xtrans/Xtrans.c
Diffstat (limited to 'X11/configure.ac')
| -rw-r--r-- | X11/configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/X11/configure.ac b/X11/configure.ac index 0e21f8e9c..04f123827 100644 --- a/X11/configure.ac +++ b/X11/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([Xproto], [7.0.24], +AC_INIT([Xproto], [7.0.25], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -209,8 +209,9 @@ if test "x$WIDEPROTO" = xno; then fi -AC_OUTPUT([Makefile +AC_CONFIG_FILES([Makefile specs/Makefile specs/SIAddresses/Makefile Xpoll.h xproto.pc]) +AC_OUTPUT |