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

compilerObject PascalPascal

marco 58b4a36869 --- Merging r31146 into '.': ... U packages/fcl-db/tests/testspecifictbufdataset.pas U packages/fcl-db/src/sqldb/sqldb.pp U packages/fcl-db/src/base/bufdataset.pas --- Recording mergeinfo for merge of r31146 into '.': U . --- Merging r31153 into '.': U packages/odbc/src/odbcsql.inc --- Recording mergeinfo for merge of r31153 into '.': G . --- Merging r31154 into '.': A packages/fcl-db/examples/createsql.pas A packages/fcl-db/examples/createsql.lpi --- Recording mergeinfo for merge of r31154 into '.': G . --- Merging r31155 into '.': U packages/fcl-db/src/base/dsparams.inc U packages/fcl-db/tests/testbasics.pas --- Recording mergeinfo for merge of r31155 into '.': G . --- Merging r31156 into '.': U packages/fcl-db/src/base/dbconst.pas --- Recording mergeinfo for merge of r31156 into '.': G . --- Merging r31157 into '.': G packages/fcl-db/src/sqldb/sqldb.pp --- Recording mergeinfo for merge of r31157 into '.': G . --- Merging r31158 into '.': U packages/fcl-db/src/sqldb/mssql/mssqlconn.pp U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc U packages/fcl-db/src/sqldb/oracle/oracleconnection.pp U packages/fcl-db/src/sqldb/postgres/pqconnection.pp U packages/fcl-db/src/sqldb/interbase/ibconnection.pp --- Recording mergeinfo for merge of r31158 into '.': G . --- Merging r31159 into '.': G packages/fcl-db/src/sqldb/mssql/mssqlconn.pp G packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp --- Recording mergeinfo for merge of r31159 into '.': G . --- Merging r31160 into '.': A packages/fcl-db/examples/logsqldemo.pas A packages/fcl-db/examples/logsqldemo.lpi --- Recording mergeinfo for merge of r31160 into '.': G . --- Merging r31161 into '.': U packages/fcl-db/examples/logsqldemo.pas --- Recording mergeinfo for merge of r31161 into '.': G . # revisions: 31146,31153,31154,31155,31156,31157,31158,31159,31160,31161 git-svn-id: branches/fixes_3_0@31274 -		2015-08-04 09:13:52 +00:00
compiler	--- Merging r29485 into '.':	2015-08-04 08:55:42 +00:00
ide	--- Merging r31166 into '.':	2015-07-11 14:20:40 +00:00
installer	--- Merging r29567 into '.':	2015-02-05 21:02:58 +00:00
packages	--- Merging r31146 into '.':	2015-08-04 09:13:52 +00:00
rtl	--- Merging r31035 into '.':	2015-08-04 08:13:01 +00:00
tests	--- Merging r29485 into '.':	2015-08-04 08:55:42 +00:00
utils	--- Merging r31168 into '.':	2015-08-04 08:49:29 +00:00
.gitattributes	--- Merging r31146 into '.':	2015-08-04 09:13:52 +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