U rtl/objpas/sysutils/filutil.inc
U rtl/objpas/sysutils/filutilh.inc
--- Recording mergeinfo for merge of r47055 into '.':
U .
# revisions: 47055
r47055 | michael | 2020-10-06 09:59:09 +0200 (Tue, 06 Oct 2020) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/filutil.inc
M /trunk/rtl/objpas/sysutils/filutilh.inc
* Add GetFileContents and GetFileAsString
git-svn-id: branches/fixes_3_2@47582 -
U .
--- Recording mergeinfo for merge of r47259 into '.':
U .
# revisions: 47259
r47259 | pierre | 2020-10-30 17:17:05 +0100 (Fri, 30 Oct 2020) | 1 line
Changed paths:
M /trunk
Add bin directory to ignore list for fpcsrc directory also
git-svn-id: branches/fixes_3_2@47581 -
U rtl/os2/sysutils.pp
--- Recording mergeinfo for merge of r47528 into '.':
U .
--- Merging r47529 into '.':
U rtl/emx/sysutils.pp
U rtl/go32v2/sysutils.pp
U rtl/msdos/sysutils.pp
U rtl/watcom/sysutils.pp
--- Recording mergeinfo for merge of r47529 into '.':
G .
# revisions: 47528,47529
r47528 | hajny | 2020-11-22 16:53:50 +0100 (Sun, 22 Nov 2020) | 1 line
Changed paths:
M /trunk/rtl/os2/sysutils.pp
* Corrections of omissions in GetLocalTime
r47529 | hajny | 2020-11-22 17:19:34 +0100 (Sun, 22 Nov 2020) | 1 line
Changed paths:
M /trunk/rtl/emx/sysutils.pp
M /trunk/rtl/go32v2/sysutils.pp
M /trunk/rtl/msdos/sysutils.pp
M /trunk/rtl/watcom/sysutils.pp
* Correction of omissions in GetLocalTime
git-svn-id: branches/fixes_3_2@47539 -
U rtl/go32v2/v2prt0.as
--- Recording mergeinfo for merge of r47536 into '.':
U .
# revisions: 47536
r47536 | karoly | 2020-11-23 04:42:16 +0100 (Mon, 23 Nov 2020) | 1 line
Changed paths:
M /trunk/rtl/go32v2/v2prt0.as
go32v2: define __crt0_startup_flags as .comm rather than a global symbol. This allows linking against DJGPP libs and code which might also define this symbol. This change is also inline with recent crt0.S versions in DJGPP.
git-svn-id: branches/fixes_3_2@47538 -
U compiler/nbas.pas
A tests/webtbs/tw38069.pp
A tests/webtbs/uw38069.pp
-- Aufzeichnung der Informationen für Zusammenführung von r47415 in ».«:
U .
git-svn-id: branches/fixes_3_2@47422 -
U compiler/defcmp.pas
U compiler/node.pas
U compiler/pexpr.pas
A tests/webtbs/tw34037.pp
-- Aufzeichnung der Informationen für Zusammenführung von r39934 in ».«:
U .
git-svn-id: branches/fixes_3_2@47421 -
U rtl/objpas/sysutils/filutil.inc
--- Recording mergeinfo for merge of r42559 into '.':
U .
# revisions: 42559
r42559 | svenbarth | 2019-08-02 15:16:17 +0200 (Fri, 02 Aug 2019) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/filutil.inc
* fix for Mantis #35906: use more accurate modified time from the FindData on Windows for the Timestamp
git-svn-id: branches/fixes_3_2@47261 -
U compiler/hlcgobj.pas
A tests/webtbs/tw35590.pp
-- Aufzeichnung der Informationen für Zusammenführung von r44119 in ».«:
U .
git-svn-id: branches/fixes_3_2@47152 -
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r47124 into '.':
U .
--- Merging r47125 into '.':
U packages/rtl-objpas/src/inc/stdconvs.pp
--- Recording mergeinfo for merge of r47125 into '.':
G .
--- Merging r47126 into '.':
U packages/dbus/src/dbuscomp.pp
--- Recording mergeinfo for merge of r47126 into '.':
G .
# revisions: 47124,47125,47126
r47124 | marco | 2020-10-18 13:26:59 +0200 (Sun, 18 Oct 2020) | 2 lines
Changed paths:
M /trunk/packages/fcl-passrc/src/pasresolver.pp
* fix spell error detected by debian lintian
r47125 | marco | 2020-10-18 13:35:47 +0200 (Sun, 18 Oct 2020) | 2 lines
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/stdconvs.pp
* debian lintian spellfix
r47126 | marco | 2020-10-18 13:43:52 +0200 (Sun, 18 Oct 2020) | 1 line
Changed paths:
M /trunk/packages/dbus/src/dbuscomp.pp
* debian lintian detected spellfix
git-svn-id: branches/fixes_3_2@47127 -
U rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r46855 into '.':
U .
# revisions: 46855
r46855 | svenbarth | 2020-09-12 10:03:10 +0200 (Sat, 12 Sep 2020) | 1 line
Changed paths:
M /trunk/rtl/win/sysutils.pp
* handle reparse points that are neither symlinks nor mount points as normal files
git-svn-id: branches/fixes_3_2@47100 -
U rtl/objpas/sysutils/syshelp.inc
U rtl/objpas/sysutils/syshelph.inc
--- Recording mergeinfo for merge of r47068 into '.':
U .
# revisions: 47068
r47068 | michael | 2020-10-09 13:21:30 +0200 (Fri, 09 Oct 2020) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/syshelp.inc
M /trunk/rtl/objpas/sysutils/syshelph.inc
* Patch from Werner Pamler to implement TStringSplitOptions.ExcludeLastEmpty
git-svn-id: branches/fixes_3_2@47099 -
U rtl/objpas/math.pp
--- Recording mergeinfo for merge of r46972 into '.':
U .
# revisions: 46972
r46972 | florian | 2020-09-27 15:05:36 +0200 (Sun, 27 Sep 2020) | 1 line
Changed paths:
M /trunk/rtl/objpas/math.pp
* reported by Bart on the mailing list: insert empty line to make clear to which function the comment applies
git-svn-id: branches/fixes_3_2@47098 -
U rtl/objpas/sysutils/syshelp.inc
--- Recording mergeinfo for merge of r46951 into '.':
U .
# revisions: 46951
r46951 | michael | 2020-09-25 10:51:21 +0200 (Fri, 25 Sep 2020) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/syshelp.inc
* Fix bug ID #37814: correctly initialize max chars
git-svn-id: branches/fixes_3_2@47097 -
U packages/googleapi/src/googledrive.pp
--- Recording mergeinfo for merge of r46985 into '.':
U .
# revisions: 46985
r46985 | michael | 2020-09-28 09:55:27 +0200 (Mon, 28 Sep 2020) | 1 line
Changed paths:
M /trunk/packages/googleapi/src/googledrive.pp
* Fix bug ID #37824
git-svn-id: branches/fixes_3_2@47096 -
------------------------------------------------------------------------
r47061 | michael | 2020-10-07 12:15:13 +0200 (Wed, 07 Oct 2020) | 1 line
* Fix bug where position is not advanced when calling ReadAnsiString/ReadString
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@47062 -
U .
--- Recording mergeinfo for merge of r42891 into '.':
U .
--- Merging r43167 into '.':
U compiler/aarch64/cgcpu.pas
U rtl/aarch64/aarch64.inc
--- Recording mergeinfo for merge of r43167 into '.':
U .
--- Recording mergeinfo for merge of r45788 into '.':
G .
--- Merging r46870 into '.':
U rtl/linux/aarch64/sighnd.inc
U rtl/linux/aarch64/sighndh.inc
--- Recording mergeinfo for merge of r46870 into '.':
G .
--- Merging r46872 into '.':
G rtl/linux/aarch64/sighnd.inc
--- Recording mergeinfo for merge of r46872 into '.':
G .
--- Merging r46913 into '.':
U compiler/systems/t_linux.pas
--- Recording mergeinfo for merge of r46913 into '.':
G .
git-svn-id: branches/fixes_3_2@47037 -
------------------------------------------------------------------------
r45720 | pierre | 2020-07-02 16:26:13 +0000 (Thu, 02 Jul 2020) | 1 line
Obsolete system_mips_embedded, as it is a duplicate of system_mipseb_embedded
------------------------------------------------------------------------
--- Merging r45720 into '.':
U compiler/systems.inc
U compiler/systems.pas
--- Recording mergeinfo for merge of r45720 into '.':
U .
git-svn-id: branches/fixes_3_2@47004 -
------------------------------------------------------------------------
r43103 | pierre | 2019-10-01 12:50:26 +0000 (Tue, 01 Oct 2019) | 1 line
Remove symbian from fppkg OS list
------------------------------------------------------------------------
--- Merging r43103 into '.':
C utils/fppkg/fpmake.pp
--- Recording mergeinfo for merge of r43103 into '.':
U .
Summary of conflicts:
Text conflicts: 1
git-svn-id: branches/fixes_3_2@46924 -
r45788 | pierre | 2020-07-15 09:01:10 +0000 (Wed, 15 Jul 2020) | 1 line
Also issue -mfpu option when calling GNU assembler for fpu_fpa family
------------------------------------------------------------------------
--- Merging r45788 into '.':
U compiler/arm/agarmgas.pas
--- Recording mergeinfo for merge of r45788 into '.':
U .
git-svn-id: branches/fixes_3_2@46922 -
------------------------------------------------------------------------
r46484 | pierre | 2020-08-18 22:52:47 +0200 (Tue, 18 Aug 2020) | 1 line
Avoid internalerror 200203273 by handling LOC_CSUBSETREG and LOC_CSUBSETREF as LOC_SUBSETREG in tcgassignmentnode.pass_generate_code
------------------------------------------------------------------------
--- Merging r46484 into '.':
U compiler/ncgld.pas
--- Recording mergeinfo for merge of r46484 into '.':
U .
------------------------------------------------------------------------
r46487 | pierre | 2020-08-18 23:58:19 +0200 (Tue, 18 Aug 2020) | 1 line
Amend commit 46484: Do not accept LOC_CSUBSETREF location type as this represents read-only memory region which should never be modified
------------------------------------------------------------------------
--- Merging r46487 into '.':
G compiler/ncgld.pas
--- Recording mergeinfo for merge of r46487 into '.':
G .
git-svn-id: branches/fixes_3_2@46921 -
to resolve conflict.
--- Merging r46471 into '.':
C rtl/symbian/Makefile
U rtl/symbian/Makefile.fpc
--- Recording mergeinfo for merge of r46471 into '.':
U .
Summary of conflicts:
Text conflicts: 1
git-svn-id: branches/fixes_3_2@46873 -
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r45989 into '.':
U .
--- Merging r46857 into '.':
G packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r46857 into '.':
G .
git-svn-id: branches/fixes_3_2@46869 -
U rtl/objpas/math.pp
--- Recording mergeinfo for merge of r46763 into '.':
U .
# revisions: 46763
r46763 | michael | 2020-09-04 17:19:28 +0200 (Fri, 04 Sep 2020) | 1 line
Changed paths:
M /trunk/rtl/objpas/math.pp
* Fix defines for fpdoc
git-svn-id: branches/fixes_3_2@46861 -
