paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-07 23:30:37 +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,870 Commits 101 Branches 76 Tags 308 MiB
Pascal 89.4%
Makefile 9.3%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
aca462ee4e
Go to file
marco aca462ee4e --- Merging r30083 into '.': 
C    packages/fpmkunit/src/fpmkunit.pp
U    packages/sdl/fpmake.pp
U    packages/rtl-objpas/fpmake.pp
U    packages/rtl-extra/fpmake.pp
U    packages/libgd/src/gd.pas
U    packages/rtl-unicode/fpmake.pp
U    rtl/nds/rtl.cfg
--- Recording mergeinfo for merge of r30083 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

# revisions: 30083

git-svn-id: branches/fixes_3_0@36002 -
2017-04-28 14:31:12 +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 * version updates 2017-02-13 08:24:06 +00:00
packages --- Merging r30083 into '.': 2017-04-28 14:31:12 +00:00
rtl --- Merging r30083 into '.': 2017-04-28 14:31:12 +00:00
tests * version updates 2017-02-13 08:24:06 +00:00
utils merged revs: 35782,35790,35791,35793,35794,35795,35798,35799,35800,35801,35802,35803,35804,35805,35806,35808,35809,35810,35811 2017-04-27 20:59:57 +00:00
.gitattributes --- Merging r35822 into '.': 2017-04-27 21:58:47 +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