paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 22:49:26 +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,672 Commits 100 Branches 75 Tags 285 MiB
Pascal 89%
Makefile 9.7%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
03be126de1
Go to file
marco 03be126de1 --- Merging r31310 into '.': 
A    packages/mysql/examples/testdb5.pp
C    packages/mysql/examples/Makefile
U    packages/mysql/examples/Makefile.fpc
--- Recording mergeinfo for merge of r31310 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

# revisions: 31310

git-svn-id: branches/fixes_3_0@33366 -
2016-03-28 14:38:47 +00:00
compiler --- Merging r30168 into '.': 2016-03-05 19:11:10 +00:00
ide * merged ide copyright. 2016-01-13 09:13:54 +00:00
installer * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
packages --- Merging r31310 into '.': 2016-03-28 14:38:47 +00:00
rtl --- Merging r32351 into '.': 2016-03-27 21:52:05 +00:00
tests --- Merging r30168 into '.': 2016-03-05 19:11:10 +00:00
utils --- Merging r32224 into '.': 2015-11-08 17:17:50 +00:00
.gitattributes --- Merging r31310 into '.': 2016-03-28 14:38:47 +00:00
.gitignore * Removed empty tests directory from svn 2014-11-08 15:47:53 +00:00
fpmake_add1.inc * Handle the location of each package at run-time, not at compilation time 2013-06-02 17:55:23 +00:00
fpmake_proc1.inc * Handle the location of each package at run-time, not at compilation time 2013-06-02 17:55:23 +00:00
fpmake.pp * Handle the location of each package at run-time, not at compilation time 2013-06-02 17:55:23 +00:00
Makefile * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
Makefile.fpc --- Merging r31308 into '.': 2015-09-06 17:20:15 +00:00