paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-06 01:07:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
54,912 Commits 100 Branches 75 Tags 314 MiB
Pascal 89%
Makefile 9.7%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
94894e7f79
Go to file
marco 94894e7f79 --- Merging r48432 into '.': 
U    compiler/msg/errorct.msg
C    compiler/msg/errord.msg
U    compiler/msg/errorda.msg
C    compiler/msg/errordu.msg
U    compiler/msg/errore.msg
U    compiler/msg/errores.msg
U    compiler/msg/errorf.msg
U    compiler/msg/errorfi.msg
U    compiler/msg/errorhe.msg
U    compiler/msg/errorheu.msg
U    compiler/msg/errorid.msg
U    compiler/msg/erroriu.msg
U    compiler/msg/errorn.msg
U    compiler/msg/errorpl.msg
U    compiler/msg/errorpli.msg
U    compiler/msg/errorpt.msg
U    compiler/msg/errorptu.msg
U    compiler/msg/errorr.msg
U    compiler/msg/errorru.msg
U    compiler/msg/errorues.msg
U    compiler/msgtxt.inc
--- Recording mergeinfo for merge of r48432 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 2

# revisions: 48432
r48432 | florian | 2021-01-26 23:03:17 +0100 (Tue, 26 Jan 2021) | 1 line
Changed paths:
   M /trunk/compiler/msg/errorct.msg
   M /trunk/compiler/msg/errord.msg
   M /trunk/compiler/msg/errorda.msg
   M /trunk/compiler/msg/errordu.msg
   M /trunk/compiler/msg/errore.msg
   M /trunk/compiler/msg/errores.msg
   M /trunk/compiler/msg/errorf.msg
   M /trunk/compiler/msg/errorfi.msg
   M /trunk/compiler/msg/errorhe.msg
   M /trunk/compiler/msg/errorheu.msg
   M /trunk/compiler/msg/errorid.msg
   M /trunk/compiler/msg/erroriu.msg
   M /trunk/compiler/msg/errorn.msg
   M /trunk/compiler/msg/errorpl.msg
   M /trunk/compiler/msg/errorpli.msg
   M /trunk/compiler/msg/errorpt.msg
   M /trunk/compiler/msg/errorptu.msg
   M /trunk/compiler/msg/errorr.msg
   M /trunk/compiler/msg/errorru.msg
   M /trunk/compiler/msg/errorues.msg
   M /trunk/compiler/msgtxt.inc

  * updated copyright year to 2021

git-svn-id: branches/fixes_3_2@49309 -
2021-05-01 12:09:53 +00:00
compiler --- Merging r48432 into '.': 2021-05-01 12:09:53 +00:00
installer Merge commit 48814: 2021-03-23 23:59:37 +00:00
packages * Merging revisions r48711 from trunk: 2021-05-01 08:58:51 +00:00
rtl * Merging revisions r49225 from trunk: 2021-05-01 08:52:31 +00:00
tests --- Merging r49236 into '.': 2021-04-19 20:52:46 +00:00
utils Fix error in conflict resolution of previous merge 2021-03-24 00:11:34 +00:00
.gitattributes --- Merging r49236 into '.': 2021-04-19 20:52:46 +00:00
.gitignore --- Merging r47259 into '.': 2020-11-25 16:11:10 +00:00
fpmake_add1.inc
fpmake_proc1.inc
fpmake.pp --- Merging (from foreign repository) r44152 into '.': 2020-02-21 14:50:44 +00:00
Makefile Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
Makefile.fpc * merged macOS/AArch64 support + revisions these changes depended on 2020-09-15 19:40:36 +00:00