U utils/ptopu.pp
--- Recording mergeinfo for merge of r43137 into '.':
U .
--- Merging r43141 into '.':
U packages/chm/src/htmlutil.pas
--- Recording mergeinfo for merge of r43141 into '.':
G .
--- Merging r43142 into '.':
U packages/libcurl/src/libcurl.pp
--- Recording mergeinfo for merge of r43142 into '.':
G .
--- Merging r43144 into '.':
U packages/rtl-objpas/fpmake.pp
A packages/rtl-objpas/src/inc/system.uitypes.pp
--- Recording mergeinfo for merge of r43144 into '.':
G .
# revisions: 43137,43141,43142,43144
git-svn-id: branches/fixes_3_2@43170 -
U rtl/objpas/sysutils/sysstr.inc
U rtl/objpas/sysutils/sysstrh.inc
--- Recording mergeinfo for merge of r40529 into '.':
U .
--- Merging r40548 into '.':
U rtl/unix/unix.pp
--- Recording mergeinfo for merge of r40548 into '.':
G .
--- Merging r40803 into '.':
U utils/ptopu.pp
--- Recording mergeinfo for merge of r40803 into '.':
G .
--- Merging r40818 into '.':
U packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r40818 into '.':
G .
--- Merging r40838 into '.':
G packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r40838 into '.':
G .
--- Merging r40841 into '.':
U packages/fcl-res/src/coffwriter.pp
--- Recording mergeinfo for merge of r40841 into '.':
G .
--- Merging r40908 into '.':
U rtl/inc/getopts.pp
--- Recording mergeinfo for merge of r40908 into '.':
G .
--- Merging r41085 into '.':
U rtl/objpas/sysutils/syswide.inc
U rtl/objpas/sysutils/syswideh.inc
--- Recording mergeinfo for merge of r41085 into '.':
G .
--- Merging r41263 into '.':
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r41263 into '.':
G .
--- Merging r41331 into '.':
U rtl/objpas/classes/parser.inc
--- Recording mergeinfo for merge of r41331 into '.':
G .
--- Merging r41332 into '.':
U packages/fcl-xml/src/xmlconf.pp
--- Recording mergeinfo for merge of r41332 into '.':
G .
# revisions: 40529,40548,40803,40818,40838,40841,40908,41085,41263,41331,41332
r40529 | michael | 2018-12-12 09:29:24 +0100 (Wed, 12 Dec 2018) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/sysstr.inc
M /trunk/rtl/objpas/sysutils/sysstrh.inc
Added overloads UintToStr for Delphi compatbibility (bug ID 0034690)
r40548 | michael | 2018-12-14 11:00:44 +0100 (Fri, 14 Dec 2018) | 1 line
Changed paths:
M /trunk/rtl/unix/unix.pp
* Fix bug #0034499
r40803 | michael | 2019-01-08 04:55:32 +0100 (Tue, 08 Jan 2019) | 1 line
Changed paths:
M /trunk/utils/ptopu.pp
* Applied patch by Bart Broersma to fix bug ID #34277
r40818 | michael | 2019-01-09 16:04:04 +0100 (Wed, 09 Jan 2019) | 1 line
Changed paths:
M /trunk/packages/openssl/src/openssl.pas
* Add PEM_write_bio_PKCS7, bug ID #0034842
r40838 | michael | 2019-01-10 23:11:33 +0100 (Thu, 10 Jan 2019) | 1 line
Changed paths:
M /trunk/packages/openssl/src/openssl.pas
* Fix stack overflow
r40841 | michael | 2019-01-11 11:53:45 +0100 (Fri, 11 Jan 2019) | 1 line
Changed paths:
M /trunk/packages/fcl-res/src/coffwriter.pp
* Call inherited constructor
r40908 | michael | 2019-01-19 17:35:30 +0100 (Sat, 19 Jan 2019) | 1 line
Changed paths:
M /trunk/rtl/inc/getopts.pp
* Fix bug ID #19842 using patch from Bart Broersma
r41085 | marco | 2019-01-27 15:52:52 +0100 (Sun, 27 Jan 2019) | 2 lines
Changed paths:
M /trunk/rtl/objpas/sysutils/syswide.inc
M /trunk/rtl/objpas/sysutils/syswideh.inc
* unicode version of isleadchar. utf8 still to follow, see #34754
r41263 | marco | 2019-02-09 13:31:15 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/strutils.pp
* Patch from Serge Anvarov with missing strutils aliases. Mantis #35047
r41331 | michael | 2019-02-16 09:39:40 +0100 (Sat, 16 Feb 2019) | 1 line
Changed paths:
M /trunk/rtl/objpas/classes/parser.inc
Fix bug ID #35086: TParser should reset position (tentative)
r41332 | michael | 2019-02-16 09:50:13 +0100 (Sat, 16 Feb 2019) | 1 line
Changed paths:
M /trunk/packages/fcl-xml/src/xmlconf.pp
* Fix bug ID #34854
git-svn-id: branches/fixes_3_2@41923 -
- '{}' and '(**)' comment types were separated.
- tokens now AnsiStrings
- the comments are now handled better, ptop now does multi line comments.
- added debug prints to verbose option
'line in-<number> out-<number> symbol "<name>" = "<value>"'
the <value> is truncated in the middle. this means visible beginning and
the end.
