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

compilerObject PascalPascal

marco 4a8dcaa476 --- Merging r30610 into '.': ... U packages/fcl-db/src/base/fields.inc U packages/fcl-db/src/base/db.pas --- Recording mergeinfo for merge of r30610 into '.': U . --- Merging r30627 into '.': U packages/fcl-db/src/sqldb/sqldb.pp U packages/fcl-db/src/base/database.inc --- Recording mergeinfo for merge of r30627 into '.': G . --- Merging r30640 into '.': G packages/fcl-db/src/base/fields.inc --- Recording mergeinfo for merge of r30640 into '.': G . --- Merging r30684 into '.': G packages/fcl-db/src/base/fields.inc --- Recording mergeinfo for merge of r30684 into '.': G . --- Merging r30691 into '.': G packages/fcl-db/src/sqldb/sqldb.pp --- Recording mergeinfo for merge of r30691 into '.': G . --- Merging r30702 into '.': G packages/fcl-db/src/base/fields.inc G packages/fcl-db/src/base/db.pas --- Recording mergeinfo for merge of r30702 into '.': G . --- Merging r30703 into '.': G packages/fcl-db/src/base/fields.inc --- Recording mergeinfo for merge of r30703 into '.': G . --- Merging r30736 into '.': U packages/fcl-db/src/sdf/sdfdata.pp --- Recording mergeinfo for merge of r30736 into '.': G . --- Merging r30737 into '.': U packages/fcl-db/src/memds/memds.pp --- Recording mergeinfo for merge of r30737 into '.': G . --- Merging r30740 into '.': U packages/fcl-db/src/sqlite/customsqliteds.pas --- Recording mergeinfo for merge of r30740 into '.': G . --- Merging r30741 into '.': U packages/fcl-db/src/sqlite/sqlite3ds.pas --- Recording mergeinfo for merge of r30741 into '.': G . --- Merging r30771 into '.': G packages/fcl-db/src/sqlite/customsqliteds.pas --- Recording mergeinfo for merge of r30771 into '.': G . # revisions: 30610,30627,30640,30684,30691,30702,30703,30736,30737,30740,30741,30771 git-svn-id: branches/fixes_3_0@31078 -		2015-06-17 08:32:14 +00:00
compiler	--- Merging r29537 into '.':	2015-06-14 20:35:18 +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 r30610 into '.':	2015-06-17 08:32:14 +00:00
rtl	--- Merging r30384 into '.':	2015-06-17 08:19:59 +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 r30384 into '.':	2015-06-17 08:19:59 +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