xserver: Branch 'master'

[Adam Jackson]

 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6f2272f44ce1a7a96ae04fdbde8708514c60771
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Apr 30 14:07:44 2018 -0400

    meson: Bump version number here too
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/meson.build b/meson.build
index a2e6a3d29..6571d08eb 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '1.19.99.904',
+        version: '1.19.99.905',
         meson_version: '>= 0.42.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')