diff options
author | marha <marha@users.sourceforge.net> | 2013-09-10 10:38:33 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-10 10:42:30 +0200 |
commit | 2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7 (patch) | |
tree | a32e3d5f8bb662ba5c14a72d97a553c4927c0b76 /libXmu/configure.ac | |
parent | d53900c52abc2402f978b72278712e4bcdbde9f2 (diff) | |
parent | 889d7dd8e94a5538f388cc619115bf5c0b6fc0b7 (diff) | |
download | vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.gz vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.bz2 vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013
Conflicts:
mesalib/src/glsl/.gitignore
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winsetsp.c
Diffstat (limited to 'libXmu/configure.ac')
-rw-r--r-- | libXmu/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXmu/configure.ac b/libXmu/configure.ac index 18f7f5830..e9d6b690e 100644 --- a/libXmu/configure.ac +++ b/libXmu/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXmu], [1.1.1], +AC_INIT([libXmu], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) |