xserver: Branch 'master'

[GitLab Mirror]

 hw/kdrive/ephyr/ephyr_glamor_glx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0854732d55a76cdb584306e8e653c2bcd292a7cb
Author: Diego Viola <diego.viola at gmail.com>
Date:   Fri Apr 19 22:13:46 2019 -0300

    ephyr: fix typo: rquires -> requires
    
    Signed-off-by: Diego Viola <diego.viola at gmail.com>

diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.c b/hw/kdrive/ephyr/ephyr_glamor_glx.c
index 3fdc6663c..b41a90eff 100644
--- a/hw/kdrive/ephyr/ephyr_glamor_glx.c
+++ b/hw/kdrive/ephyr/ephyr_glamor_glx.c
@@ -321,7 +321,7 @@ ephyr_glamor_glx_screen_init(xcb_window_t win)
             ctx = glXCreateContextAttribsARB(dpy, fb_config, NULL, True,
                                              context_attribs);
         } else {
-            FatalError("Xephyr -glamor_gles2 rquires "
+            FatalError("Xephyr -glamor_gles2 requires "
                        "GLX_EXT_create_context_es2_profile\n");
         }
     } else {