libX11: Changes to 'master'

[Peter Hutterer]

 modules/im/ximcp/imLcPrs.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 19a30f17f30e9ae9641a7c0634fc52134208b060
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon May 18 07:56:22 2015 +1000

    Fix an indentation issue
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Hans de Goede <hdegoede at redhat.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 013ccece124b990217ad3bcf2c41688e8fda1df8
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon May 18 07:55:17 2015 +1000

    Fix potential memory leak
    
    If we hit the depth limit, filename leaks. Move the depth check up before we
    allocate filename.
    Introduced in 226622349a4b1e16064649d4444a34fb4be4f464.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Hans de Goede <hdegoede at redhat.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>