diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-20 17:39:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-20 17:39:30 +0200 |
| commit | ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4 (patch) | |
| tree | b18ae337e913f36a95f97530f6a792e9366a393c /xorg-server/include/protocol-versions.h | |
| parent | 4207bc7b2972aed9a45756fae8c48957d323fa21 (diff) | |
| parent | 0e3699334faf92f508b6c187a261548b656b0dd3 (diff) | |
| download | vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.tar.gz vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.tar.bz2 vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/resource.c
Diffstat (limited to 'xorg-server/include/protocol-versions.h')
| -rw-r--r-- | xorg-server/include/protocol-versions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h index 479ac2f77..cb8e213bb 100644 --- a/xorg-server/include/protocol-versions.h +++ b/xorg-server/include/protocol-versions.h @@ -135,7 +135,7 @@ /* Resource */ #define SERVER_XRES_MAJOR_VERSION 1 -#define SERVER_XRES_MINOR_VERSION 0 +#define SERVER_XRES_MINOR_VERSION 2 /* XvMC */ #define SERVER_XVMC_MAJOR_VERSION 1 |