Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 éve
..
patches 9d4bc97935 remove xset calls from global config 14 éve
Makefile f14c1fc551 resolve merge conflict 11 éve