U rtl/inc/fexpand.inc
--- Recording mergeinfo for merge of r30653 into '.':
U .
--- Merging r30654 into '.':
U tests/test/units/dos/tfexpand.pp
--- Recording mergeinfo for merge of r30654 into '.':
G .
--- Merging r30774 into '.':
G tests/test/units/dos/tfexpand.pp
--- Recording mergeinfo for merge of r30774 into '.':
G .
--- Merging r30788 into '.':
U rtl/amiga/system.pp
--- Recording mergeinfo for merge of r30788 into '.':
G .
--- Merging r30789 into '.':
U rtl/morphos/system.pp
--- Recording mergeinfo for merge of r30789 into '.':
G .
--- Merging r30790 into '.':
U packages/fcl-process/fpmake.pp
A packages/fcl-process/src/amicommon
A packages/fcl-process/src/amicommon/process.inc
A packages/fcl-process/src/amicommon/pipes.inc
A packages/fcl-process/src/amicommon/simpleipc.inc
--- Recording mergeinfo for merge of r30790 into '.':
G .
--- Merging r30803 into '.':
U packages/fcl-process/src/amicommon/simpleipc.inc
--- Recording mergeinfo for merge of r30803 into '.':
G .
--- Merging r30805 into '.':
U packages/fcl-process/src/amicommon/process.inc
U packages/fcl-process/src/amicommon/pipes.inc
--- Recording mergeinfo for merge of r30805 into '.':
G .
--- Merging r30806 into '.':
G packages/fcl-process/src/amicommon/process.inc
G packages/fcl-process/src/amicommon/pipes.inc
--- Recording mergeinfo for merge of r30806 into '.':
G .
--- Merging r30812 into '.':
U packages/morphunits/src/amigados.pas
U packages/amunits/src/coreunits/amigados.pas
G packages/fcl-process/src/amicommon/process.inc
G packages/fcl-process/src/amicommon/pipes.inc
U packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r30812 into '.':
G .
--- Merging r30813 into '.':
U rtl/aros/system.pp
--- Recording mergeinfo for merge of r30813 into '.':
G .
# revisions: 30653,30654,30774,30788,30789,30790,30803,30805,30806,30812,30813
git-svn-id: branches/fixes_3_0@31082 -
U compiler/symdef.pas
A tests/webtbs/tw27320.pp
A tests/webtbs/uw27320.defaults.pp
--- Recording mergeinfo for merge of r29537 into '.':
U .
--- Merging r29579 into '.':
A tests/webtbs/tw27348.pp
G compiler/symdef.pas
--- Recording mergeinfo for merge of r29579 into '.':
G .
--- Merging r29743 into '.':
U compiler/rautils.pas
G compiler/symdef.pas
--- Recording mergeinfo for merge of r29743 into '.':
G .
--- Merging r29685 into '.':
A tests/webtbs/tw27424.pp
U compiler/pgenutil.pas
--- Recording mergeinfo for merge of r29685 into '.':
G .
--- Merging r30160 into '.':
U rtl/inc/cgeneric.inc
--- Recording mergeinfo for merge of r30160 into '.':
G .
--- Merging r31028 into '.':
U rtl/objpas/classes/classes.inc
A tests/webtbs/tw28271.pp
--- Recording mergeinfo for merge of r31028 into '.':
G .
# revisions: 29537,29579,29743,29685,30160,31028
git-svn-id: branches/fixes_3_0@31065 -
U compiler/psub.pas
A tests/tbs/tb0609.pp
--- Merging r29691 into '.':
U rtl/inc/system.inc
# revisions: 29590,29691
git-svn-id: branches/fixes_3_0@29770 -
U packages/chm/src/chmwriter.pas
U packages/chm/src/chmfilewriter.pas
U packages/chm/src/chmcmd.lpr
--- Merging r29546 into '.':
U rtl/inc/system.fpd
--- Merging r29547 into '.':
U utils/fpdoc/fpdoc.pp
--- Merging r29548 into '.':
U utils/fpdoc/makeskel.pp
--- Merging r29550 into '.':
G packages/chm/src/chmcmd.lpr
# revisions: 29545,29546,29547,29548,29550
git-svn-id: branches/fixes_3_0@29720 -
U rtl/inc/system.fpd
--- Merging r29470 into '.':
G rtl/inc/system.fpd
--- Merging r29475 into '.':
U compiler/msg/errore.msg
U compiler/msgtxt.inc
--- Merging r29477 into '.':
U rtl/dragonfly/x86_64/cprt0.as
--- Merging r29478 into '.':
U packages/openssl/src/openssl.pas
--- Merging r29491 into '.':
U installer/install.dat
--- Merging r29492 into '.':
U rtl/os2/sysos.inc
U rtl/os2/sysucode.inc
--- Merging r29494 into '.':
U utils/fpmake.pp
# revisions: 29469,29470,29475,29477,29478,29491,29492,29494
git-svn-id: branches/fixes_3_0@29505 -
fpc_ansistr_to_widechararray(), so that CP_ACP/CP_OEM etc are properly
handled (fixes assign/assignfile with non-ansi characters in source files
that don't explicitly specify the code page)
git-svn-id: trunk@29218 -
InternalTinyFreeMem cannot handle that (which causes heap corruption), and it
indicates a bug in the program anyway, because the area between HeapPtr and
HeapEnd is free (so it indicates either a double free or freeing an invalid
pointer).
git-svn-id: trunk@28658 -
RegisterTinyHeapBlock_Simple, but expects its address and size parameters to
be already aligned on a TinyHeapAllocGranularity boundary
git-svn-id: trunk@28651 -
