Waldemar Brodkorb e1e46622ac Revert "resolve merge" %!s(int64=11) %!d(string=hai) anos
..
Makefile.arch e1e46622ac Revert "resolve merge" %!s(int64=11) %!d(string=hai) anos
pt-machine.c e1e46622ac Revert "resolve merge" %!s(int64=11) %!d(string=hai) anos
pt-machine.h e1e46622ac Revert "resolve merge" %!s(int64=11) %!d(string=hai) anos