Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 年之前
..
patches 9d4bc97935 remove xset calls from global config 15 年之前
Makefile f14c1fc551 resolve merge conflict 12 年之前