The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 01a9fcd624 --- Merging r30290 into '.':
U    packages/fcl-image/src/fpreadpng.pp
--- Recording mergeinfo for merge of r30290 into '.':
 U   .
--- Merging r30296 into '.':
U    packages/fcl-image/src/fpwritepng.pp
--- Recording mergeinfo for merge of r30296 into '.':
 G   .
--- Merging r30690 into '.':
U    packages/fcl-image/src/fpreadtiff.pas
--- Recording mergeinfo for merge of r30690 into '.':
 G   .
--- Merging r30692 into '.':
G    packages/fcl-image/src/fpreadtiff.pas
--- Recording mergeinfo for merge of r30692 into '.':
 G   .
--- Merging r30696 into '.':
G    packages/fcl-image/src/fpwritepng.pp
--- Recording mergeinfo for merge of r30696 into '.':
 G   .
--- Merging r30697 into '.':
G    packages/fcl-image/src/fpwritepng.pp
--- Recording mergeinfo for merge of r30697 into '.':
 G   .

# revisions: 30290,30296,30690,30692,30696,30697

git-svn-id: branches/fixes_3_0@31106 -
2015-06-17 19:43:32 +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 r30290 into '.': 2015-06-17 19:43:32 +00:00
rtl --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +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