On Wed, 2015-11-25 at 18:39 -0800, Alex Goins wrote: > Signed-off-by: Alex Goins <[email protected]> > --- > hw/xfree86/common/xf86Module.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/xfree86/common/xf86Module.h > b/hw/xfree86/common/xf86Module.h > index 9e5dc6d..7a8b7ab 100644 > --- a/hw/xfree86/common/xf86Module.h > +++ b/hw/xfree86/common/xf86Module.h > @@ -80,7 +80,7 @@ typedef enum { > * mask is 0xFFFF0000. > */ > #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) > -#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(20, 0) > +#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(21, 0) > #define ABI_XINPUT_VERSION SET_ABI_VERSION(22, 1) > #define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0) > #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
These first three are uncontroversial, merged: remote: I: patch #66274 updated using rev cf5d6414e0c21140f763d618bde1e91ad2b1cb49. remote: I: patch #66273 updated using rev 7006b4e7ff759c899d5391b7d12db889cbc0b535. remote: I: patch #66275 updated using rev 8d3f0e964e399dcfa8eb5e85d405217fdc5dbcd4. remote: I: 3 patch(es) updated to state Accepted. To ssh://git.freedesktop.org/git/xorg/xserver ab9837c..8d3f0e9 master -> master - ajax _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
