xserver: Branch 'master'

[Peter Hutterer]

 hw/xfree86/common/xf86Init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 574069c2912893a9b9fd3d701eb3ad4784e31553
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Apr 2 15:04:08 2018 -0700

    xfree86: Restore newline before "X Protocol Version" string
    
    The newline before the protocl version got lost in commit
    6cbefc3e0a33b380c147c533914437c7798d9b93. Prior to that commit, the
    release date printed a newline at the end:
    
     X.Org X Server 1.19.6
     Release Date: 2017-12-20
     X Protocol Version 11, Revision 0
     Build Operating System: Linux 4.14.12-1-ARCH x86_64
    
    Now, that string gets run together with the version:
    
     X.Org X Server 1.19.99.903 (1.20.0 RC 3)X Protocol Version 11, Revision 0
     Build Operating System: Linux
    
    Since the version string printing has a variety of #ifdefs in it, just
    add the newline to the begining of the protocol version string.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index ea42ec946..3c5cc7097 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -165,7 +165,7 @@ xf86PrintBanner(void)
 #ifdef XORG_CUSTOM_VERSION
     xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);
 #endif
-    xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",
+    xf86ErrorFVerb(0, "\nX Protocol Version %d, Revision %d\n",
                    X_PROTOCOL, X_PROTOCOL_REVISION);
     xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
 #ifdef HAS_UTSNAME