U rtl/wince/wininc/defines.inc
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r39670 into '.':
U .
# revisions: 39670
git-svn-id: branches/fixes_3_2@39791 -
U packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r39707 into '.':
U .
--- Merging r39708 into '.':
U packages/chm/src/chmwriter.pas
U packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r39708 into '.':
G .
--- Merging r39743 into '.':
U rtl/objpas/sysutils/finah.inc
--- Recording mergeinfo for merge of r39743 into '.':
G .
--- Merging r39744 into '.':
U packages/fcl-image/src/fpimage.pp
--- Recording mergeinfo for merge of r39744 into '.':
G .
--- Merging r39784 into '.':
U utils/data2inc.exm
--- Recording mergeinfo for merge of r39784 into '.':
G .
# revisions: 39707,39708,39743,39744,39784
git-svn-id: branches/fixes_3_2@39790 -
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r39756 into '.':
U .
U utils/fpcm/fpcmake.inc
U utils/fpcm/fpcmake.ini
--- Recording mergeinfo for merge of r39757 into '.':
G .
-------------------------------------------------------------------------
r39756 | pierre | 2018-09-14 16:06:27 +0200 (Fri, 14 Sep 2018) | 1 line
Add AIXSharedLibExt to avoid failure on pas2js shared library installation for AIX OS
------------------------------------------------------------------------
------------------------------------------------------------------------
r39757 | pierre | 2018-09-14 16:07:38 +0200 (Fri, 14 Sep 2018) | 1 line
Add SHAREDLIBEXT=.a for AIX OS to fpcmake.ini
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@39766 -
U packages/fcl-process/src/process.pp
U packages/fcl-process/src/win/process.inc
U packages/fcl-process/src/unix/process.inc
--- Recording mergeinfo for merge of r39681 into '.':
U .
# revisions: 39681
git-svn-id: branches/fixes_3_2@39682 -
U packages/fcl-registry/src/winreg.inc
--- Recording mergeinfo for merge of r39666 into '.':
U .
--- Merging r39667 into '.':
U packages/fcl-registry/src/registry.pp
--- Recording mergeinfo for merge of r39667 into '.':
G .
--- Merging r39673 into '.':
U rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r39673 into '.':
G .
--- Merging r39675 into '.':
U rtl/win/wininc/defines.inc
U rtl/win/wininc/redef.inc
--- Recording mergeinfo for merge of r39675 into '.':
G .
--- Merging r39676 into '.':
U packages/fcl-image/src/fpreadpng.pp
--- Recording mergeinfo for merge of r39676 into '.':
G .
# revisions: 39666,39667,39673,39675,39676
git-svn-id: branches/fixes_3_2@39677 -
U packages/fcl-fpcunit/src/exampletests/money.pp
--- Recording mergeinfo for merge of r39657 into '.':
U .
--- Merging r39658 into '.':
U packages/fcl-registry/src/regini.inc
U packages/fcl-registry/src/xregreg.inc
--- Recording mergeinfo for merge of r39658 into '.':
G .
--- Merging r39659 into '.':
G packages/fcl-registry/src/xregreg.inc
--- Recording mergeinfo for merge of r39659 into '.':
G .
--- Merging r39660 into '.':
U packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc
--- Recording mergeinfo for merge of r39660 into '.':
G .
--- Merging r39662 into '.':
U rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r39662 into '.':
G .
--- Merging r39663 into '.':
D rtl/linux/oldlinux.pp
--- Recording mergeinfo for merge of r39663 into '.':
G .
# revisions: 39657,39658,39659,39660,39662,39663
git-svn-id: branches/fixes_3_2@39665 -
U rtl/linux/arm/stat.inc
U rtl/linux/m68k/stat.inc
U rtl/linux/aarch64/stat.inc
U rtl/linux/powerpc64/stat.inc
U rtl/linux/i386/stat.inc
U rtl/linux/x86_64/stat.inc
--- Recording mergeinfo for merge of r39644 into '.':
U .
--- Merging r39651 into '.':
U packages/fcl-process/src/process.pp
U packages/fcl-process/src/processunicode.pp
U packages/fcl-process/src/processbody.inc
--- Recording mergeinfo for merge of r39651 into '.':
G .
--- Merging r39655 into '.':
U rtl/linux/powerpc/stat.inc
--- Recording mergeinfo for merge of r39655 into '.':
G .
# revisions: 39644,39651,39655
git-svn-id: branches/fixes_3_2@39656 -
* first misc files & rename process.pp -> processbody.inc
Next commit will add new process.pp + update of processbody.inc to preserve history.
git-svn-id: trunk@39626 -
* clean some stale variable declarations
* variable with class to instantiate in runcommand. This allows hooking runcommand* with a derivative.
git-svn-id: trunk@39625 -
