paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 19:09:17 +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.
44,887 Commits 101 Branches 76 Tags 321 MiB
Pascal 89.4%
Makefile 9.3%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
1d62a37c74
Go to file
marco 1d62a37c74 --- Merging r34840 into '.': 
U    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34840 into '.':
 U   .
--- Merging r34841 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34841 into '.':
 G   .
--- Merging r34842 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34842 into '.':
 G   .
--- Merging r34843 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34843 into '.':
 G   .
--- Merging r34844 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34844 into '.':
 G   .
--- Merging r34845 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34845 into '.':
 G   .
--- Merging r34848 into '.':
G    utils/pas2jni/writer.pas
U    utils/pas2jni/def.pas
U    utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r34848 into '.':
 G   .
--- Merging r34862 into '.':
G    utils/pas2jni/def.pas
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34862 into '.':
 G   .
--- Merging r34863 into '.':
G    utils/pas2jni/def.pas
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34863 into '.':
 G   .
--- Merging r34951 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34951 into '.':
 G   .
--- Merging r34952 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34952 into '.':
 G   .
--- Merging r34953 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34953 into '.':
 G   .
--- Merging r34954 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r34954 into '.':
 G   .
--- Merging r35779 into '.':
G    utils/pas2jni/def.pas
G    utils/pas2jni/ppuparser.pas
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r35779 into '.':
 G   .

# revisions: 34840,34841,34842,34843,34844,34845,34848,34862,34863,34951,34952,34953,34954,35779

git-svn-id: branches/fixes_3_0@36051 -
2017-05-01 20:36:47 +00:00
compiler --- Merging r34878 into '.': 2017-04-27 17:16:21 +00:00
ide * version updates 2017-02-13 08:24:06 +00:00
installer --- Merging r32032 into '.': 2017-04-29 16:08:40 +00:00
packages --- Merging r35594 into '.': 2017-05-01 20:23:28 +00:00
rtl --- Merging r33038 into '.': 2017-05-01 20:03:32 +00:00
tests * version updates 2017-02-13 08:24:06 +00:00
utils --- Merging r34840 into '.': 2017-05-01 20:36:47 +00:00
.gitattributes --- Merging r34871 into '.': 2017-05-01 20:22:18 +00:00
.gitignore * Removed empty tests directory from svn 2014-11-08 15:47:53 +00:00
fpmake_add1.inc
fpmake_proc1.inc
fpmake.pp
Makefile * update allowed versions after question from Mattias 2017-03-03 08:26:55 +00:00
Makefile.fpc * update allowed versions after question from Mattias 2017-03-03 08:26:55 +00:00