paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-05 19:10:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
44,498 Commits 101 Branches 76 Tags 305 MiB
Pascal 89.4%
Makefile 9.3%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
e263ebeb1d
Go to file
marco e263ebeb1d --- Merging r30137 into '.': 
U    packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r30137 into '.':
 U   .
--- Merging r30138 into '.':
U    packages/sqlite/tests/test.pas
U    packages/sqlite/src/sqlite3db.pas
--- Recording mergeinfo for merge of r30138 into '.':
 G   .
--- Merging r30139 into '.':
G    packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r30139 into '.':
 G   .
--- Merging r30149 into '.':
G    packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r30149 into '.':
 G   .
--- Merging r30154 into '.':
U    packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r30154 into '.':
 G   .
--- Merging r30155 into '.':
G    packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r30155 into '.':
 G   .
--- Merging r30291 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
U    packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30291 into '.':
 G   .
--- Merging r30295 into '.':
U    packages/fcl-db/tests/testspecifictbufdataset.pas
U    packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30295 into '.':
 G   .
--- Merging r30305 into '.':
G    packages/fcl-db/src/sqldb/sqldb.pp
G    packages/fcl-db/src/sqldb/postgres/pqconnection.pp
G    packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r30305 into '.':
 G   .
--- Merging r30306 into '.':
U    packages/fcl-db/src/base/sqlscript.pp
--- Recording mergeinfo for merge of r30306 into '.':
 G   .
--- Merging r30325 into '.':
U    packages/fcl-db/tests/testdbbasics.pas
G    packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30325 into '.':
 G   .
--- Merging r30366 into '.':
U    packages/fcl-db/src/base/dataset.inc
U    packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r30366 into '.':
 G   .
--- Merging r30383 into '.':
G    packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30383 into '.':
 G   .
--- Merging r30397 into '.':
G    packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30397 into '.':
 G   .
--- Merging r30399 into '.':
U    packages/fcl-db/tests/testfieldtypes.pas
U    packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
--- Recording mergeinfo for merge of r30399 into '.':
 G   .
--- Merging r30400 into '.':
G    packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r30400 into '.':
 G   .
--- Merging r30417 into '.':
U    packages/fcl-db/fpmake.pp
A    packages/fcl-db/tests/tccsvdataset.pp
U    packages/fcl-db/tests/dbtestframework.pas
U    packages/fcl-db/tests/dbtestframework_gui.lpi
U    packages/fcl-db/tests/dbtestframework_gui.lpr
A    packages/fcl-db/src/base/csvdataset.pp
--- Recording mergeinfo for merge of r30417 into '.':
 G   .
--- Merging r30416 into '.':
U    packages/fcl-base/fpmake.pp
A    packages/fcl-base/src/csvdocument.pp
A    packages/fcl-base/src/csvreadwrite.pp
--- Recording mergeinfo for merge of r30416 into '.':
 G   .
--- Merging r30418 into '.':
U    packages/fcl-db/src/export/fpcsvexport.pp
U    packages/fcl-db/tests/testdbexport.pas
--- Recording mergeinfo for merge of r30418 into '.':
 G   .
--- Merging r30421 into '.':
U    packages/fcl-db/tests/tcsdfdata.pp
U    packages/fcl-db/src/sdf/sdfdata.pp
--- Recording mergeinfo for merge of r30421 into '.':
 G   .
--- Merging r30431 into '.':
G    packages/fcl-db/src/base/db.pas
U    packages/fcl-db/src/base/database.inc
--- Recording mergeinfo for merge of r30431 into '.':
 G   .
--- Merging r30433 into '.':
G    packages/fcl-db/src/base/bufdataset.pas
U    packages/fcl-db/src/base/csvdataset.pp
--- Recording mergeinfo for merge of r30433 into '.':
 G   .
--- Merging r30434 into '.':
U    packages/fcl-db/src/base/dbconst.pas
G    packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r30434 into '.':
 G   .
--- Merging r30435 into '.':
G    packages/fcl-db/src/base/db.pas
U    packages/fcl-db/src/base/fields.inc
G    packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r30435 into '.':
 G   .
--- Merging r30437 into '.':
G    packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r30437 into '.':
 G   .

# revisions: 30137,30138,30139,30149,30154,30155,30291,30295,30305,30306,30325,30366,30383,30397,30399,30400,30417,30416,30418,30421,30431,30433,30434,30435,30437

git-svn-id: branches/fixes_3_0@31068 -
2015-06-16 19:15:23 +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 r30137 into '.': 2015-06-16 19:15:23 +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 r30137 into '.': 2015-06-16 19:15:23 +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