Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
files 938b9116f7 enable X11 XVideo Extensions %!s(int64=15) %!d(string=hai) anos
patches 79fdadf099 remove obsolete patch %!s(int64=14) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos