U packages/fcl-image/src/clipping.pp
--- Recording mergeinfo for merge of r49373 into '.':
U .
# revisions: 49373
r49373 | marco | 2021-05-15 22:45:48 +0200 (Sat, 15 May 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-image/src/clipping.pp
* fix for mantis 38889, swap bottom and rect in pointinside
git-svn-id: branches/fixes_3_2@49611 -
U rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r49478 into '.':
U .
# revisions: 49478
r49478 | marco | 2021-06-05 17:42:34 +0200 (Sat, 05 Jun 2021) | 2 lines
Changed paths:
M /trunk/rtl/objpas/classes/streams.inc
* fix from Sebastian Hellwig for writeunicodestring bytes number, mantis 0038963
git-svn-id: branches/fixes_3_2@49610 -
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 -
------------------------------------------------------------------------
r45733 | pierre | 2020-07-06 13:39:42 +0200 (Mon, 06 Jul 2020) | 1 line
Fix cycle with -CriotR option on aarch64-linux
------------------------------------------------------------------------
--- Merging r45733 into '.':
U compiler/constexp.pas
--- Recording mergeinfo for merge of r45733 into '.':
U .
git-svn-id: branches/fixes_3_2@49606 -
U packages/rtl-objpas/src/inc/system.uitypes.pp
--- Recording mergeinfo for merge of r49563 into '.':
U .
--- Merging r49566 into '.':
G packages/rtl-objpas/src/inc/system.uitypes.pp
--- Recording mergeinfo for merge of r49566 into '.':
G .
# revisions: 49563,49566
fetching log for rev 49563 - 369 characters
r49563 | marco | 2021-06-26 18:00:12 +0200 (Sat, 26 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/system.uitypes.pp
* tcolors alias.
* a few missing colors copied from lazarus' graphics unit
fetching log for rev 49566 - 305 characters
r49566 | marco | 2021-06-26 21:24:57 +0200 (Sat, 26 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/system.uitypes.pp
* fix typo
git-svn-id: branches/fixes_3_2@49600 -
U packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r49598 into '.':
U .
# revisions: 49598
r49598 | marco | 2021-07-11 15:09:56 +0200 (Sun, 11 Jul 2021) | 1 line
Changed paths:
M /trunk/packages/sqlite/src/sqlite3.inc
* ente ->enter as reported by KryptKicker
git-svn-id: branches/fixes_3_2@49599 -
r47234 | pierre | 2020-10-28 12:37:57 +0000 (Wed, 28 Oct 2020) | 1 line
Update -T help output after introduction of iOS targets
------------------------------------------------------------------------
--- Merging r47234 into '.':
U compiler/msg/errore.msg
U compiler/msgidx.inc
U compiler/msgtxt.inc
--- Recording mergeinfo for merge of r47234 into '.':
U .
git-svn-id: branches/fixes_3_2@49533 -
Add setting of all optimization debug macros with single DEBUG_ALL_OPT macro
------------------------------------------------------------------------
--- Merging r48111 into '.':
U compiler/fpcdefs.inc
--- Recording mergeinfo for merge of r48111 into '.':
U .
------------------------------------------------------------------------
r48112 | pierre | 2021-01-08 12:13:43 +0100 (Fri, 08 Jan 2021) | 1 line
Fix compilation with -dALLOCREGDEBUG
------------------------------------------------------------------------
--- Merging r48112 into '.':
U compiler/aoptobj.pas
--- Recording mergeinfo for merge of r48112 into '.':
G .
git-svn-id: branches/fixes_3_2@49497 -
r48140 | pierre | 2021-01-11 22:17:09 +0000 (Mon, 11 Jan 2021) | 1 line
Correct check of stringtype inside use_tag_prefix function
------------------------------------------------------------------------
--- Merging r48140 into '.':
U compiler/dbgstabs.pas
--- Recording mergeinfo for merge of r48140 into '.':
U .
git-svn-id: branches/fixes_3_2@49447 -
r42206 | pierre | 2019-06-10 13:55:59 +0000 (Mon, 10 Jun 2019) | 1 line
Fix error in commit #42199
------------------------------------------------------------------------
--- Merging r42206 into '.':
U compiler/dbgstabx.pas
--- Recording mergeinfo for merge of r42206 into '.':
U .
git-svn-id: branches/fixes_3_2@49423 -
r42199 | pierre | 2019-06-09 20:59:06 +0000 (Sun, 09 Jun 2019) | 1 line
Use use_tag_types everywhere to get consistent results for 'Tt' versus 't' for stabs for string definitions
------------------------------------------------------------------------
--- Merging r42199 into '.':
U compiler/dbgstabs.pas
U compiler/dbgstabx.pas
--- Recording mergeinfo for merge of r42199 into '.':
U .
git-svn-id: branches/fixes_3_2@49422 -
r40155 | jonas | 2018-11-01 20:39:38 +0000 (Thu, 01 Nov 2018) | 1 line
* fixed compilation with -O3 (one false positive, one real error)
------------------------------------------------------------------------
--- Merging r40155 into '.':
C compiler/riscv { not present in fixes branch }
U compiler/sparcgen/ncpumat.pas
--- Recording mergeinfo for merge of r40155 into '.':
U .
Summary of conflicts:
Tree conflicts: 1
git-svn-id: branches/fixes_3_2@49419 -
r40821 | pierre | 2019-01-09 22:48:08 +0000 (Wed, 09 Jan 2019) | 1 line
Avoid warnings with -O4 option
------------------------------------------------------------------------
--- Merging r40821 into '.':
U compiler/ogomf.pas
--- Recording mergeinfo for merge of r40821 into '.':
U .
git-svn-id: branches/fixes_3_2@49418 -
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 -
------------------------------------------------------------------------
r47343 | michael | 2020-11-08 18:05:01 +0100 (Sun, 08 Nov 2020) | 1 line
* Fix bug #37852, possible memleak
------------------------------------------------------------------------
r47344 | michael | 2020-11-08 18:10:07 +0100 (Sun, 08 Nov 2020) | 1 line
* Correct line number
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49320 -
------------------------------------------------------------------------
r47342 | michael | 2020-11-08 17:42:06 +0100 (Sun, 08 Nov 2020) | 1 line
* Fail with trailing garbage in joStrict mode, bug ID #0037837
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49319 -
------------------------------------------------------------------------
r47006 | michael | 2020-09-29 17:45:27 +0200 (Tue, 29 Sep 2020) | 1 line
* More strict behaviour for identifiers, patch by Benito van der Zander (bug ID 37841)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49318 -
