Merge with master
authorGiuseppe Penone <giuspen@gmail.com>
Sun, 15 Sep 2013 11:05:25 +0000 (13:05 +0200)
committerGiuseppe Penone <giuspen@gmail.com>
Sun, 15 Sep 2013 11:05:25 +0000 (13:05 +0200)
commit64323b2f32401b5930af088fa2b116e732dae3ea
tree46008f490a3b24e9fe9ccc3aa137cbb06ffdfc1e
parent1226b78d47bf889c2f564ea96a12c8303a048868
parent134681156a7729021333a0e69af09f8db2518134
Merge with master
src/plugin.h
src/plugins/xkb/xkb-plugin.c