xserver: Branch 'master'

[Peter Hutterer]

 hw/xwayland/xwayland-output.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cc882af336c8963a2cba0c93e29869ef59b19818
Author: Roman Gilg <subdiff at gmail.com>
Date:   Tue Apr 11 15:52:58 2017 +0200

    xwayland: Small comment edit
    
    Be more precise in describing the return value.
    
    Signed-off-by: Roman Gilg <subdiff at gmail.com>
    Reviewed-by: Daniel Stone <daniels at collabora.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index d9047c596..bfaf9795a 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -137,8 +137,9 @@ output_get_new_size(struct xwl_output *xwl_output,
 /* Approximate some kind of mmpd (m.m. per dot) of the screen given the outputs
  * associated with it.
  *
- * It will either calculate the mean mmpd of all the outputs, or default to
- * 96 DPI if no reasonable value could be calculated.
+ * It either calculates the mean mmpd of all the outputs or, if no reasonable
+ * value could be calculated, defaults to the mmpd of a screen with a DPI value
+ * of DEFAULT_DPI.
  */
 static double
 approximate_mmpd(struct xwl_screen *xwl_screen)