symbols: fix bad 'merge' assignment
authorRan Benita <ran234@gmail.com>
Tue, 19 Feb 2013 09:10:23 +0000 (11:10 +0200)
committerDaniel Stone <daniel@fooishbar.org>
Mon, 18 Mar 2013 22:20:02 +0000 (22:20 +0000)
commit164cec663600703987010a20cad895ad5b9efd09
tree81f875539f26c9777d47e9035519942b8b434cb8
parent8cee7490003381b7e1399e171a8c860edb3d634c
symbols: fix bad 'merge' assignment

Bug introduced in 2a5b0c9dc1ad1488ecc6b139fd70e464eb687da6, was causing
some keys to be merged incorrectly.

Signed-off-by: Ran Benita <ran234@gmail.com>
src/xkbcomp/symbols.c