Merge remote-tracking branch 'ran/fixes-cont'
authorDaniel Stone <daniel@fooishbar.org>
Mon, 5 Mar 2012 15:07:28 +0000 (15:07 +0000)
committerDaniel Stone <daniel@fooishbar.org>
Mon, 5 Mar 2012 15:07:28 +0000 (15:07 +0000)
commited18e65eacdabfeaeafee7c369891312af99c82d
tree06dca8e6531a3819c5d374ad5db6495dd8312db7
parent65e1ff2f0ad182f6bbaaa1fd67317d147384af4f
parente4b4d6b0510075fe62234f66185bf619c70fc126
Merge remote-tracking branch 'ran/fixes-cont'

Conflicts:
src/xkbcomp/expr.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
src/xkbcomp/expr.c
src/xkbcomp/keytypes.c