Merge remote-tracking branch 'krh/keysyms'
authorDaniel Stone <daniel@fooishbar.org>
Wed, 9 May 2012 19:12:12 +0000 (20:12 +0100)
committerDaniel Stone <daniel@fooishbar.org>
Wed, 9 May 2012 19:15:46 +0000 (20:15 +0100)
commit6433d72e7c13b7be5ed7bf227441b68b909ef46d
treefcf14002fc4f4ed3b2f3b4e94c97a5cc88d3d2ee
parent5e59ef3f4707c673d325006b662ffdff5d65c7d1
parentace1e5df6d2f9cd7ecf5fa5088d5c79fbd1edd64
Merge remote-tracking branch 'krh/keysyms'

Conflicts:
src/keysym.c
src/misc.c
src/text.h
src/xkbcomp/expr.c
src/xkbcomp/parser.y
src/xkbcomp/parseutils.c
src/xkbcomp/symbols.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 files changed:
Makefile.am
include/xkbcommon/xkbcommon.h
makekeys/makekeys.c
src/keysym.c
src/misc.c
src/xkb-priv.h
src/xkbcomp/compat.c
src/xkbcomp/expr.c
src/xkbcomp/parseutils.c
src/xkbcomp/symbols.c
test/state.c
test/xkey.c