The sources of the Free Pascal compiler, RTL, packages and utilities. See https://www.freepascal.org/ for more info.
Go to file
marco 266e156ff3 --- Merging r31035 into '.':
U    rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r31035 into '.':
 U   .
--- Merging r31043 into '.':
G    rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r31043 into '.':
 G   .
--- Merging r31225 into '.':
U    packages/fcl-db/src/sqldb/odbc/odbcconn.pas
--- Recording mergeinfo for merge of r31225 into '.':
 G   .

# revisions: 31035,31043,31225

git-svn-id: branches/fixes_3_0@31268 -
2015-08-04 08:13:01 +00:00
compiler --- Merging r31007 into '.': 2015-06-18 14:46:56 +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 r31035 into '.': 2015-08-04 08:13:01 +00:00
rtl --- Merging r31035 into '.': 2015-08-04 08:13:01 +00:00
tests --- Merging r30952 into '.': 2015-06-21 15:31:54 +00:00
utils --- Merging r31166 into '.': 2015-07-11 14:20:40 +00:00
.gitattributes --- Merging r30858 into '.': 2015-06-18 20:02:34 +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