xkbcomp: Changes to 'master'

[Peter Hutterer]

 symbols.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit bf4d7d059daf5c6f81d70f8d3e5e2a87265381b7
Author: Benno Schulenberg <bensberg at justemail.net>
Date:   Thu Sep 11 22:04:21 2014 +0200

    When overriding a key, adjust also its number of levels (#57242).
    
    Specifying an explicit key type when overriding a key should adjust
    the number of levels to that of the specified type. This gets rid of
    the age-old warning of the right Alt key being ONE_LEVEL but having
    two symbols assigned.
    
    Fixes bug #57242 <http://bugs.freedesktop.org/show_bug.cgi?id=57242>.
    
    Signed-off-by: Benno Schulenberg <bensberg at justemail.net>
    Reviewed-by: Ran Benita <ran234 at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>