Merge remote-tracking branch 'ran/fixes'
authorDaniel Stone <daniel@fooishbar.org>
Mon, 5 Mar 2012 15:00:39 +0000 (15:00 +0000)
committerDaniel Stone <daniel@fooishbar.org>
Mon, 5 Mar 2012 15:00:39 +0000 (15:00 +0000)
commit65e1ff2f0ad182f6bbaaa1fd67317d147384af4f
tree8dd09c1b4baacdc3ca417810e08beea2a89d11ab
parent90f04e042b776eda656440ca9ac49af05d86196f
parentc41061a005e6db409dbbf57c06320f7813afc62d
Merge remote-tracking branch 'ran/fixes'
src/xkbcomp/expr.c
src/xkbcomp/keytypes.c