marco cce08d837b --- Merging r49490 into '.': ... 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 -		2021-07-13 13:35:01 +00:00
..
examples	Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini	2020-09-23 09:47:20 +00:00
src	--- Merging r49490 into '.':	2021-07-13 13:35:01 +00:00
fpmake.pp	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
gtk2forlazarus.lpk
Makefile	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
Makefile.fpc	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
Makefile.fpc.fpcmake	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00