Skip to content
  • Marco Van de Voort's avatar
    --- Merging r39785 into '.': · 338873d7
    Marco Van de Voort authored
    U    packages/fcl-stl/src/gset.pp
    --- Recording mergeinfo for merge of r39785 into '.':
     U   .
    --- Merging r39786 into '.':
    A    tests/tbs/tb0651.pp
    U    compiler/symdef.pas
    --- Recording mergeinfo for merge of r39786 into '.':
     G   .
    --- Merging r39787 into '.':
    U    compiler/pexpr.pas
    A    tests/webtbs/uw34287a.pp
    A    tests/webtbs/tw34287.pp
    A    tests/webtbs/uw34287b.pp
    --- Recording mergeinfo for merge of r39787 into '.':
     G   .
    --- Merging r39788 into '.':
    U    compiler/nbas.pas
    --- Recording mergeinfo for merge of r39788 into '.':
     G   .
    --- Merging r39812 into '.':
    G    compiler/pexpr.pas
    --- Recording mergeinfo for merge of r39812 into '.':
     G   .
    
    # revisions: 39785,39786,39787,39788,39812
    
    git-svn-id: branches/fixes_3_2@39835 -
    338873d7