Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos
..
files 2d7666cde2 simplify add_rcconf %!s(int64=12) %!d(string=hai) anos
patches 13d54c7f78 update to rc1 %!s(int64=12) %!d(string=hai) anos
src 8654ad5356 add missing source files %!s(int64=12) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos