Waldemar Brodkorb f14c1fc551 resolve merge conflict пре 12 година
..
patches 9d4bc97935 remove xset calls from global config пре 15 година
Makefile f14c1fc551 resolve merge conflict пре 12 година