The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco a16d796692 --- Merging r30462 into '.':
U    packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30462 into '.':
 U   .
--- Merging r30463 into '.':
U    packages/fcl-db/tests/testsqldb.pas
U    packages/fcl-db/src/sqldb/postgres/pqconnection.pp
U    packages/fcl-db/src/sqldb/interbase/ibconnection.pp
G    packages/fcl-db/src/sqldb/sqldb.pp
U    packages/fcl-db/src/base/dbconst.pas
--- Recording mergeinfo for merge of r30463 into '.':
 G   .
--- Merging r30467 into '.':
U    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30467 into '.':
 G   .
--- Merging r30468 into '.':
U    packages/fcl-db/src/base/db.pas
U    packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30468 into '.':
 G   .
--- Merging r30482 into '.':
G    packages/fcl-db/src/base/db.pas
U    packages/fcl-db/src/base/database.inc
--- Recording mergeinfo for merge of r30482 into '.':
 G   .
--- Merging r30483 into '.':
G    packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30483 into '.':
 G   .
--- Merging r30493 into '.':
G    packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30493 into '.':
 G   .
--- Merging r30494 into '.':
G    packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30494 into '.':
 G   .
--- Merging r30503 into '.':
U    packages/fcl-db/tests/testdbbasics.pas
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30503 into '.':
 G   .
--- Merging r30504 into '.':
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30504 into '.':
 G   .
--- Merging r30505 into '.':
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30505 into '.':
 G   .
--- Merging r30507 into '.':
G    packages/fcl-db/tests/testdbbasics.pas
U    packages/fcl-db/tests/sdfdstoolsunit.pas
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30507 into '.':
 G   .
--- Merging r30508 into '.':
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30508 into '.':
 G   .
--- Merging r30509 into '.':
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30509 into '.':
 G   .
--- Merging r30513 into '.':
U    packages/fcl-db/tests/tcsdfdata.pp
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30513 into '.':
 G   .
--- Merging r30529 into '.':
G    packages/fcl-db/src/sdf/sdfdata.pp
G    packages/fcl-db/tests/tcsdfdata.pp
--- Recording mergeinfo for merge of r30529 into '.':
 G   .
--- Merging r30530 into '.':
G    packages/fcl-db/tests/tcsdfdata.pp
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30530 into '.':
 G   .
--- Merging r30531 into '.':
G    packages/fcl-db/tests/testdbbasics.pas
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30531 into '.':
 G   .
--- Merging r30532 into '.':
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30532 into '.':
 G   .
--- Merging r30567 into '.':
G    packages/fcl-db/tests/tcsdfdata.pp
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30567 into '.':
 G   .
--- Merging r30568 into '.':
G    packages/fcl-db/tests/tcsdfdata.pp
--- Recording mergeinfo for merge of r30568 into '.':
 G   .
--- Merging r30569 into '.':
G    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30569 into '.':
 G   .
--- Merging r30570 into '.':
G    packages/fcl-db/tests/testdbbasics.pas
--- Recording mergeinfo for merge of r30570 into '.':
 G   .
--- Merging r30571 into '.':
U    packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r30571 into '.':
 G   .

# revisions: 30462,30463,30467,30468,30482,30483,30493,30494,30503,30504,30505,30507,30508,30509,30513,30529,30530,30531,30532,30567,30568,30569,30570,30571

git-svn-id: branches/fixes_3_0@31072 -
2015-06-17 07:27:02 +00:00
compiler --- Merging r29537 into '.': 2015-06-14 20:35:18 +00:00
ide * makefile regen and version updates. 2015-01-05 15:04:54 +00:00
installer --- Merging r29567 into '.': 2015-02-05 21:02:58 +00:00
packages --- Merging r30462 into '.': 2015-06-17 07:27:02 +00:00
rtl --- Merging r29537 into '.': 2015-06-14 20:35:18 +00:00
tests --- Merging r29537 into '.': 2015-06-14 20:35:18 +00:00
utils --- Merging r29426 into '.': 2015-06-14 20:37:31 +00:00
.gitattributes --- Merging r29761 into '.': 2015-06-16 19:37:35 +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