Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches ea9a2e2624 add new package cmake (2) 14 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu