paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-04 18:10:26 +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,689 Commits 101 Branches 76 Tags 303 MiB
Pascal 89.4%
Makefile 9.3%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
dffd304b98
Go to file
marco dffd304b98 --- Merging r31885 into '.': 
A    packages/fcl-base/src/advancedipc.pp
U    packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r31885 into '.':
 U   .
--- Merging r31890 into '.':
U    packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31890 into '.':
 G   .
--- Merging r31925 into '.':
G    packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31925 into '.':
 G   .
--- Merging r31939 into '.':
A    packages/fcl-base/examples/testipc_client.pp
A    packages/fcl-base/examples/testipc_server.pp
--- Recording mergeinfo for merge of r31939 into '.':
 G   .
--- Merging r31940 into '.':
G    packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31940 into '.':
 G   .
--- Merging r31955 into '.':
G    packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31955 into '.':
 G   .
--- Merging r32287 into '.':
A    packages/fcl-base/examples/sitest.pp
G    packages/fcl-base/fpmake.pp
A    packages/fcl-base/src/singleinstance.pp
U    packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32287 into '.':
 G   .
--- Merging r32288 into '.':
G    packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32288 into '.':
 G   .
--- Merging r32289 into '.':
G    packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32289 into '.':
 G   .
--- Merging r32291 into '.':
G    packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32291 into '.':
 G   .
--- Merging r32321 into '.':
U    packages/fcl-base/src/contnrs.pp
--- Recording mergeinfo for merge of r32321 into '.':
 G   .
--- Merging r32767 into '.':
G    packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32767 into '.':
 G   .
--- Merging r32770 into '.':
G    packages/fcl-base/src/custapp.pp
G    packages/fcl-base/src/advancedipc.pp
U    packages/fcl-base/src/singleinstance.pp
U    packages/fcl-base/examples/sitest.pp
--- Recording mergeinfo for merge of r32770 into '.':
 G   .
--- Merging r32772 into '.':
G    packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r32772 into '.':
 G   .
--- Merging r32773 into '.':
G    packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r32773 into '.':
 G   .
--- Merging r33052 into '.':
G    packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r33052 into '.':
 G   .

# revisions: 31885,31890,31925,31939,31940,31955,32287,32288,32289,32291,32321,32767,32770,32772,32773,33052

git-svn-id: branches/fixes_3_0@33398 -
2016-03-31 13:02:34 +00:00
compiler --- Merging r30168 into '.': 2016-03-05 19:11:10 +00:00
ide * merged ide copyright. 2016-01-13 09:13:54 +00:00
installer * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
packages --- Merging r31885 into '.': 2016-03-31 13:02:34 +00:00
rtl --- Merging r32946 into '.': 2016-03-31 07:56:57 +00:00
tests --- Merging r30168 into '.': 2016-03-05 19:11:10 +00:00
utils --- Merging r32224 into '.': 2015-11-08 17:17:50 +00:00
.gitattributes --- Merging r31885 into '.': 2016-03-31 13:02:34 +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