-
Marco Van de Voort authored
U . --- Merging r39693 into '.': A tests/tbs/tb0650.pp U compiler/symtable.pas --- Recording mergeinfo for merge of r39693 into '.': U . --- Merging r39700 into '.': U compiler/msg/errore.msg --- Recording mergeinfo for merge of r39700 into '.': G . --- Merging r39701 into '.': U compiler/msgtxt.inc U compiler/msgidx.inc --- Recording mergeinfo for merge of r39701 into '.': G . --- Merging r39702 into '.': U compiler/pdecsub.pas A tests/test/tgeneric105.pp --- Recording mergeinfo for merge of r39702 into '.': G . --- Merging r39703 into '.': A tests/test/tgenfunc18.pp A tests/test/tgenfunc17.pp G compiler/pdecsub.pas --- Recording mergeinfo for merge of r39703 into '.': G . --- Merging r39715 into '.': U packages/rtl-extra/src/inc/objects.pp A tests/webtbs/tw34239.pp --- Recording mergeinfo for merge of r39715 into '.': G . --- Merging r39727 into '.': G packages/rtl-extra/src/inc/objects.pp --- Recording mergeinfo for merge of r39727 into '.': G . # revisions: 39673,39693,39700,39701,39702,39703,39715,39727 git-svn-id: branches/fixes_3_2@39834 -
2b01261f