U    compiler/symtable.pas
--- Recording mergeinfo for merge of r39711 into '.':
 U   .
--- Merging r39728 into '.':
G    compiler/symtable.pas
--- Recording mergeinfo for merge of r39728 into '.':
 G   .
--- Merging r39692 into '.':
U    compiler/psub.pas
A    tests/test/tgeneric104.pp
A    tests/test/ugeneric104.pp
--- Recording mergeinfo for merge of r39692 into '.':
 G   .
--- Merging r39699 into '.':
U    packages/libffi/src/ffi.manager.pp
--- Recording mergeinfo for merge of r39699 into '.':
 G   .

# revisions: 39711,39728,39692,39699

git-svn-id: branches/fixes_3_2@39810 -