diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-09-29 14:18:35 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-09-29 14:18:35 +1000 |
| commit | 057cc92ebfeebe81b7d01ff2c6aa2c066c8d1a64 (patch) | |
| tree | 9d2d821c8b9c011c35b440552c34246c7822fea7 /include | |
| parent | afb1fe695d197187a301c19863a128a65389b15c (diff) | |
| parent | 52c9b59a9fed6abfeca775a7a04133cee18eac0b (diff) | |
Merge branch 'raw-events' into next
Conflicts:
configure.ac
dix/events.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/protocol-versions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/protocol-versions.h b/include/protocol-versions.h index 7b7a9f53c..832bcf756 100644 --- a/include/protocol-versions.h +++ b/include/protocol-versions.h @@ -127,7 +127,7 @@ /* X Input */ #define SERVER_XI_MAJOR_VERSION 2 -#define SERVER_XI_MINOR_VERSION 0 +#define SERVER_XI_MINOR_VERSION 1 /* XKB */ #define SERVER_XKB_MAJOR_VERSION 1 |