diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
| commit | 2112b7dec49833ba872bd3ebcd7288930fec0796 (patch) | |
| tree | 407c80c9a70f590af2d4c3e5c14678827e189331 /xorg-server/glamor/glamor_eglmodule.c | |
| parent | 8badbdef38ce843dc443ddee219eda4040ef2cd5 (diff) | |
| parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
| download | vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.gz vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.bz2 vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'xorg-server/glamor/glamor_eglmodule.c')
| -rw-r--r-- | xorg-server/glamor/glamor_eglmodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/glamor/glamor_eglmodule.c b/xorg-server/glamor/glamor_eglmodule.c index 5ddd60235..d7e183649 100644 --- a/xorg-server/glamor/glamor_eglmodule.c +++ b/xorg-server/glamor/glamor_eglmodule.c @@ -30,6 +30,7 @@ #include "dix-config.h" #include <xorg-server.h> +#include <xf86.h> #define GLAMOR_FOR_XORG #include <xf86Module.h> #include "glamor.h" @@ -40,7 +41,7 @@ static XF86ModuleVersionInfo VersRec = { MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, + 1, 0, 0, /* version */ ABI_CLASS_ANSIC, /* Only need the ansic layer */ ABI_ANSIC_VERSION, MOD_CLASS_NONE, |