libxkbfile: Changes to 'master'

[GitLab Mirror]

 src/maprules.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04336c9260b2d130f57fcf3dedc3ba73bb45889d
Author: Ran Benita <ran234 at gmail.com>
Date:   Wed Aug 29 12:33:33 2012 +0300

    Fix check for appending '|' character when applying rules
    
    There are two ways to separate multiple files in XKB include statements:
    '+' will cause the later file to override the first in case of conflict,
    while '|' will cause it augment it (this is done by xkbcomp). '!' is
    unrelated here.
    Currently, if someone tries to use '|' in a rule instead of '+', it
    won't have any effect. Since '|' is practically never used, this wasn't
    noticed.
    
    Signed-off-by: Ran Benita <ran234 at gmail.com>