diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-29 20:50:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-29 20:50:12 +0200 |
| commit | aec798fb4dc72d616732d0fa711faffaa8cd7590 (patch) | |
| tree | 2814dfe69e7fb25b57492244d5cfa59d80fc8837 /xorg-server/xkeyboard-config/configure.ac | |
| parent | 78c6c2b88ae54977a2a617f116a1598657a98b6f (diff) | |
| parent | 816a5430313e07083c5325f0a430126a2e10ec41 (diff) | |
| download | vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.gz vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.bz2 vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'xorg-server/xkeyboard-config/configure.ac')
| -rw-r--r-- | xorg-server/xkeyboard-config/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/configure.ac b/xorg-server/xkeyboard-config/configure.ac index a0886a645..d5de53cee 100644 --- a/xorg-server/xkeyboard-config/configure.ac +++ b/xorg-server/xkeyboard-config/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(xkeyboard-config, 2.11) +AC_INIT(xkeyboard-config, 2.12) AC_CONFIG_SRCDIR(rules/base.xml.in) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE |