paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-23 18:09:49 +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,540 Commits 100 Branches 75 Tags 290 MiB
Pascal 89%
Makefile 9.7%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
7ca1faa6b4
Go to file
marco 7ca1faa6b4 --- Merging r30728 into '.': 
U    rtl/unix/dos.pp
--- Recording mergeinfo for merge of r30728 into '.':
 U   .
--- Merging r30704 into '.':
U    rtl/objpas/sysutils/sysuintf.inc
--- Recording mergeinfo for merge of r30704 into '.':
 G   .
--- Merging r30652 into '.':
U    packages/cdrom/src/cdrom.pp
--- Recording mergeinfo for merge of r30652 into '.':
 G   .
--- Merging r30642 into '.':
U    packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r30642 into '.':
 G   .

# revisions: 30728,30704,30652,30642

git-svn-id: branches/fixes_3_0@31112 -
2015-06-18 08:37:09 +00:00
compiler --- Merging r30364 into '.': 2015-06-17 11:17:16 +00:00
ide --- Recording mergeinfo for merge of r30359 into '.': 2015-06-17 08:12:01 +00:00
installer --- Merging r29567 into '.': 2015-02-05 21:02:58 +00:00
packages --- Merging r30728 into '.': 2015-06-18 08:37:09 +00:00
rtl --- Merging r30728 into '.': 2015-06-18 08:37:09 +00:00
tests --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
utils --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +00:00
.gitattributes --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +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 --- Merging r29434 into '.': 2015-01-13 13:58:55 +00:00
Makefile.fpc --- Merging r29434 into '.': 2015-01-13 13:58:55 +00:00