xkbcomp: Changes to 'master'

[Peter Hutterer]

 misc.c |   29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

New commits:
commit 8995ac58e15595de9158c2d8df9e02b0c925e8f4
Author: Ran Benita <ran234 at gmail.com>
Date:   Wed Jan 6 21:32:52 2016 +0100

    When a file contains several maps, look for a default map
    
    Rather than always taking the first one in the file. This is exactly the
    intended use of the 'default' flag.
    
    Note that pretty much the same code is duplicated in xkbcomp.c when
    compiling a single file from the command line, but there it is
    implemented correctly (look for XkbLC_Default).
    
    https://bugs.freedesktop.org/show_bug.cgi?id=69950
    
    Signed-off-by: Ran Benita <ran234 at gmail.com>
    Tested-by: Benno Schulenberg <bensberg at justemail.net>
    Acked-by: Sergey Udaltsov <sergey.udaltsov at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>