C Makefile
C Makefile.fpc
--- Recording mergeinfo for merge of r49045 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 49045
r49045 | jonas | 2021-03-24 15:33:09 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/Makefile
M /trunk/Makefile.fpc
* support building with FPC 3.2.2
git-svn-id: branches/fixes_3_2@49384 -
------------------------------------------------------------------------
r48814 | pierre | 2021-02-26 17:15:30 +0000 (Fri, 26 Feb 2021) | 1 line
Do not add libgcc directory to library directories with -Fl option if -Xd option is used
------------------------------------------------------------------------
------------------------------------------------------------------------
r42843 | pierre | 2019-08-26 21:41:41 +0000 (Mon, 26 Aug 2019) | 1 line
Partial update for go32v2 and sources
------------------------------------------------------------------------
--- Merging r44112 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r44112 into '.':
G .
------------------------------------------------------------------------
r48836 | hajny | 2021-02-28 02:08:17 +0000 (Sun, 28 Feb 2021) | 1 line
* package tplylib added, corrections for more than 31 items on a tab
------------------------------------------------------------------------
--- Merging r48836 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r48836 into '.':
G .
------------------------------------------------------------------------
r49035 | pierre | 2021-03-22 23:26:26 +0000 (Mon, 22 Mar 2021) | 1 line
Try to fix short package name issues in install.dat and add missing go32v2 packages
------------------------------------------------------------------------
--- Merging r49035 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r49035 into '.':
G .
git-svn-id: branches/fixes_3_2@49041 -
U packages/fcl-process/src/amicommon/process.inc
--- Recording mergeinfo for merge of r42301 into '.':
U .
--- Merging r42760 into '.':
U packages/amunits/src/coreunits/intuition.pas
--- Recording mergeinfo for merge of r42760 into '.':
G .
--- Merging r44045 into '.':
U packages/amunits/src/coreunits/amigados.pas
--- Recording mergeinfo for merge of r44045 into '.':
G .
--- Merging r44059 into '.':
U packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r44059 into '.':
G .
--- Merging r44102 into '.':
G packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r44102 into '.':
G .
--- Merging r44105 into '.':
U packages/amunits/src/coreunits/agraphics.pas
U packages/amunits/src/coreunits/datatypes.pas
U packages/amunits/src/coreunits/exec.pas
G packages/amunits/src/coreunits/intuition.pas
U packages/amunits/src/coreunits/locale.pas
U packages/amunits/src/otherlibs/cybergraphics.pas
U packages/morphunits/src/keymap.pas
U packages/morphunits/src/mui.pas
--- Recording mergeinfo for merge of r44105 into '.':
G .
# revisions: 42301,42760,44045,44059,44102,44105
git-svn-id: branches/fixes_3_2@44106 -
U packages/amunits/src/coreunits/console.pas
U packages/amunits/src/coreunits/conunit.pas
--- Recording mergeinfo for merge of r43812 into '.':
U .
--- Merging r43814 into '.':
U packages/rtl-console/fpmake.pp
U packages/rtl-console/src/amiga/crt.pp
--- Recording mergeinfo for merge of r43814 into '.':
G .
--- Merging r43815 into '.':
U packages/arosunits/fpmake.pp
A packages/arosunits/src/console.pas
A packages/arosunits/src/conunit.pas
U packages/morphunits/fpmake.pp
A packages/morphunits/src/console.pas
A packages/morphunits/src/conunit.pas
U packages/os4units/fpmake.pp
A packages/os4units/src/console.pas
A packages/os4units/src/conunit.pas
G packages/rtl-console/fpmake.pp
A packages/rtl-console/src/amicommon/crt.pp
D packages/rtl-console/src/amiga
--- Recording mergeinfo for merge of r43815 into '.':
G .
--- Merging r43827 into '.':
G packages/rtl-console/fpmake.pp
U packages/rtl-console/src/amicommon/crt.pp
--- Recording mergeinfo for merge of r43827 into '.':
G .
--- Merging r43847 into '.':
G packages/rtl-console/src/amicommon/crt.pp
--- Recording mergeinfo for merge of r43847 into '.':
G .
--- Merging r43854 into '.':
G packages/rtl-console/src/amicommon/crt.pp
--- Recording mergeinfo for merge of r43854 into '.':
G .
--- Merging r43876 into '.':
G packages/rtl-console/src/amicommon/crt.pp
--- Recording mergeinfo for merge of r43876 into '.':
G .
# revisions: 43812,43814,43815,43827,43847,43854,43876
git-svn-id: branches/fixes_3_2@43959 -
U packages/morphunits/src/amigados.pas
U packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r41941 into '.':
U .
--- Merging r41942 into '.':
U packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r41942 into '.':
G .
--- Merging r41944 into '.':
U packages/arosunits/src/agraphics.pas
--- Recording mergeinfo for merge of r41944 into '.':
G .
--- Merging r41945 into '.':
U packages/morphunits/src/agraphics.pas
--- Recording mergeinfo for merge of r41945 into '.':
G .
--- Merging r41947 into '.':
U packages/arosunits/src/intuition.pas
--- Recording mergeinfo for merge of r41947 into '.':
G .
--- Merging r41948 into '.':
U packages/morphunits/src/intuition.pas
--- Recording mergeinfo for merge of r41948 into '.':
G .
--- Merging r41953 into '.':
U packages/morphunits/src/utility.pas
--- Recording mergeinfo for merge of r41953 into '.':
G .
--- Merging r41955 into '.':
U packages/amunits/src/coreunits/agraphics.pas
U packages/amunits/src/coreunits/clipboard.pas
U packages/amunits/src/coreunits/intuition.pas
--- Recording mergeinfo for merge of r41955 into '.':
G .
--- Merging r41956 into '.':
U packages/arosunits/src/datatypes.pas
U packages/arosunits/src/locale.pas
U packages/arosunits/src/serial.pas
U packages/arosunits/src/workbench.pas
--- Recording mergeinfo for merge of r41956 into '.':
G .
--- Merging r41957 into '.':
U packages/morphunits/src/datatypes.pas
--- Recording mergeinfo for merge of r41957 into '.':
G .
# revisions: 41941,41942,41944,41945,41947,41948,41953,41955,41956,41957
git-svn-id: branches/fixes_3_2@41984 -
U packages/amunits/src/coreunits/serial.pas
--- Recording mergeinfo for merge of r40496 into '.':
U .
--- Merging r40497 into '.':
A packages/arosunits/src/serial.pas
U packages/arosunits/src/exec.pas
U packages/arosunits/fpmake.pp
A packages/os4units/src/serial.pas
U packages/os4units/src/exec.pas
U packages/os4units/fpmake.pp
U packages/morphunits/fpmake.pp
A packages/morphunits/src/serial.pas
U packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r40497 into '.':
G .
--- Merging r40653 into '.':
U packages/amunits/src/coreunits/amigados.pas
--- Recording mergeinfo for merge of r40653 into '.':
G .
# revisions: 40496,40497,40653
git-svn-id: branches/fixes_3_2@41260 -
