mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-09 19:08:15 +02:00
46533ea1e8
U packages/rtl-objpas/src/inc/variants.pp --- Recording mergeinfo for merge of r49040 into '.': U . --- Merging r49044 into '.': U packages/rtl-objpas/src/inc/strutils.pp --- Recording mergeinfo for merge of r49044 into '.': G . --- Merging r49047 into '.': U packages/regexpr/src/regexpr.pas --- Recording mergeinfo for merge of r49047 into '.': G . --- Merging r49101 into '.': U rtl/win/wininc/struct.inc --- Recording mergeinfo for merge of r49101 into '.': G . --- Merging r49104 into '.': C compiler/aarch64/cgcpu.pas A tests/webtbs/tw38695.pp --- Recording mergeinfo for merge of r49104 into '.': G . Summary of conflicts: Text conflicts: 1 # revisions: 49040,49044,49047,49101,49104 r49040 | florian | 2021-03-23 21:57:18 +0100 (Tue, 23 Mar 2021) | 1 line Changed paths: M /trunk/packages/rtl-objpas/src/inc/variants.pp * patch by Arnaud Bouchez: initialize dummy_data properly, resolves #38653 r49044 | michael | 2021-03-24 11:40:03 +0100 (Wed, 24 Mar 2021) | 1 line Changed paths: M /trunk/packages/rtl-objpas/src/inc/strutils.pp Fix casing, bug ID #38660 r49047 | michael | 2021-03-24 18:05:26 +0100 (Wed, 24 Mar 2021) | 1 line Changed paths: M /trunk/packages/regexpr/src/regexpr.pas * Fix issue #38442 r49101 | marco | 2021-04-02 16:54:40 +0200 (Fri, 02 Apr 2021) | 1 line Changed paths: M /trunk/rtl/win/wininc/struct.inc * split propsheetheader in -A and -W variants. r49104 | florian | 2021-04-02 18:44:43 +0200 (Fri, 02 Apr 2021) | 2 lines Changed paths: M /trunk/compiler/aarch64/cgcpu.pas A /trunk/tests/webtbs/tw38695.pp * Aarch64: patch by J. Gareth Moreton: fix constant writing, resolves #38695 + test git-svn-id: branches/fixes_3_2@49110 - |
||
|---|---|---|
| .. | ||
| examples | ||
| src | ||
| tests | ||
| fpmake.pp | ||
| Makefile | ||
| Makefile.fpc | ||
| Makefile.fpc.fpcmake | ||