The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.

compilerObject PascalPascal

marco e58f7faae9 --- Merging r30364 into '.': ... U rtl/amicommon/dos.pp --- Recording mergeinfo for merge of r30364 into '.': U . --- Merging r30390 into '.': G rtl/amicommon/dos.pp --- Recording mergeinfo for merge of r30390 into '.': G . --- Merging r30391 into '.': G rtl/amicommon/dos.pp --- Recording mergeinfo for merge of r30391 into '.': G . --- Merging r30565 into '.': U compiler/systems/i_amiga.pas U compiler/systems/i_morph.pas C rtl/amiga/Makefile U rtl/amiga/Makefile.fpc C rtl/morphos/Makefile U rtl/morphos/Makefile.fpc --- Recording mergeinfo for merge of r30565 into '.': G . Summary of conflicts: Text conflicts: 2 # revisions: 30364,30390,30391,30565 git-svn-id: branches/fixes_3_0@31081 -		2015-06-17 11:17:16 +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 r29553 into '.':	2015-06-17 09:28:57 +00:00
rtl	--- Merging r30364 into '.':	2015-06-17 11:17:16 +00:00
tests	--- Merging r30384 into '.':	2015-06-17 08:19:59 +00:00
utils	--- Merging r29426 into '.':	2015-06-14 20:37:31 +00:00
.gitattributes	--- Merging r29657 into '.':	2015-06-17 08:59:53 +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