paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-24 06:19:11 +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,637 Commits 100 Branches 75 Tags 292 MiB
Pascal 89%
Makefile 9.7%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
47963b9189
Go to file
joost 47963b9189 --- Merging r31331 into '.': 
C    rtl/haiku/Makefile
--- Recording mergeinfo for merge of r31331 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1
Summary of conflicts:
  Text conflicts: 1

# revisions: 31331

git-svn-id: branches/fixes_3_0@32228 -
2015-11-04 19:48:13 +00:00
compiler Merged revision(s) 32072, 32078 from trunk: 2015-10-17 16:37:28 +00:00
ide * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
installer * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
packages --- Merging r31332 into '.': 2015-11-01 20:46:02 +00:00
rtl --- Merging r31331 into '.': 2015-11-04 19:48:13 +00:00
tests * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
utils Merged revision(s) 32083 from trunk: 2015-10-17 20:39:08 +00:00
.gitattributes --- Merging r31831 into '.': 2015-10-09 18:47:20 +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 * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
Makefile.fpc --- Merging r31308 into '.': 2015-09-06 17:20:15 +00:00