marco 74aff88586 --- Merging r49045 into '.': %!s(int64=4) %!d(string=hai) anos
..
examples 582fd28d5c * Merging revisions r43477,r43483 from trunk: %!s(int64=5) %!d(string=hai) anos
src 582fd28d5c * Merging revisions r43477,r43483 from trunk: %!s(int64=5) %!d(string=hai) anos
Makefile 74aff88586 --- Merging r49045 into '.': %!s(int64=4) %!d(string=hai) anos
Makefile.fpc 74aff88586 --- Merging r49045 into '.': %!s(int64=4) %!d(string=hai) anos
fpmake.pp 74aff88586 --- Merging r49045 into '.': %!s(int64=4) %!d(string=hai) anos