The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 1d5749ea2b --- Merging r30300 into '.':
U    rtl/objpas/classes/classesh.inc
U    rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r30300 into '.':
 U   .
--- Merging r30301 into '.':
G    rtl/objpas/classes/stringl.inc
G    rtl/objpas/classes/classesh.inc
--- Recording mergeinfo for merge of r30301 into '.':
 G   .
--- Merging r30302 into '.':
G    rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r30302 into '.':
 G   .
--- Merging r30367 into '.':
U    rtl/objpas/classes/reader.inc
G    rtl/objpas/classes/classesh.inc
U    rtl/objpas/classes/writer.inc
--- Recording mergeinfo for merge of r30367 into '.':
 G   .
--- Merging r30368 into '.':
U    rtl/unix/timezone.inc
--- Recording mergeinfo for merge of r30368 into '.':
 G   .
--- Merging r30628 into '.':
U    packages/rtl-objpas/src/inc/dateutil.inc
--- Recording mergeinfo for merge of r30628 into '.':
 G   .

# revisions: 30300,30301,30302,30367,30368,30628

git-svn-id: branches/fixes_3_0@31117 -
2015-06-18 09:31:15 +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 r30300 into '.': 2015-06-18 09:31:15 +00:00
rtl --- Merging r30300 into '.': 2015-06-18 09:31:15 +00:00
tests --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
utils --- Merging r30258 into '.': 2015-06-18 08:54:50 +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