U packages/fcl-db/src/base/db.pas
U packages/paszlib/src/zstream.pp
--- Recording mergeinfo for merge of r49490 into '.':
U .
--- Merging r49491 into '.':
G packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r49491 into '.':
G .
--- Merging r49492 into '.':
U packages/paszlib/src/infblock.pas
U packages/paszlib/src/infcodes.pas
U packages/paszlib/src/inffast.pas
U packages/paszlib/src/zbase.pas
U packages/paszlib/src/zconf.inc
U packages/paszlib/src/zdeflate.pas
--- Recording mergeinfo for merge of r49492 into '.':
G .
--- Merging r49565 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r49565 into '.':
G .
--- Merging r49590 into '.':
U packages/gtk2/src/gtkext/gtkstatusicon.inc
U packages/gtk2/src/gtkext/gtkstatusiconh.inc
--- Recording mergeinfo for merge of r49590 into '.':
G .
# revisions: 49490,49491,49492,49565,49590
r49490 | marco | 2021-06-08 10:52:50 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/fcl-db/src/base/db.pas
M /trunk/packages/paszlib/src/zstream.pp
* use local buffer for seek mantis #38930 patch by Hendi.
r49491 | marco | 2021-06-08 10:53:42 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/fcl-db/src/base/db.pas
* revert accidentally modified file.
r49492 | marco | 2021-06-08 10:58:21 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/paszlib/src/infblock.pas
M /trunk/packages/paszlib/src/infcodes.pas
M /trunk/packages/paszlib/src/inffast.pas
M /trunk/packages/paszlib/src/zbase.pas
M /trunk/packages/paszlib/src/zconf.inc
M /trunk/packages/paszlib/src/zdeflate.pas
* commit second patch (from Hendi) from mantis #38930, make debug define compiling again
r49565 | marco | 2021-06-26 20:36:37 +0200 (Sat, 26 Jun 2021) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* redo psd constants, mantis #39022
r49590 | marco | 2021-07-10 14:07:55 +0200 (Sat, 10 Jul 2021) | 6 lines
Changed paths:
M /trunk/packages/gtk2/src/gtkext/gtkstatusicon.inc
M /trunk/packages/gtk2/src/gtkext/gtkstatusiconh.inc
* add gtk_status_icon_set_tooltip_text as per Juha's patch, mantis #39199
--This line, and those below, will be ignored--
M gtk2/src/gtkext/gtkstatusicon.inc
M gtk2/src/gtkext/gtkstatusiconh.inc
git-svn-id: branches/fixes_3_2@49607 -
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 -
Solves issues with systems that e.g. require special options for compilation of programs (e.g. libc programs to find libc startup code) or the actual build has been compiled with options that are incompatible with default ones.
Tested changes by building an i386-linux local build and i386-linux->arm-linux cross-builds
git-svn-id: trunk@22397 -
