paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 12:49:28 +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,532 Commits 100 Branches 75 Tags 287 MiB
Pascal 89%
Makefile 9.7%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
5b66aee3f5
Go to file
marco 5b66aee3f5 --- Merging r29781 into '.': 
U    packages/graph/src/win32/graph.pp
--- Recording mergeinfo for merge of r29781 into '.':
 U   .
--- Merging r30246 into '.':
U    packages/graph/src/go32v2/graph.pp
U    packages/graph/src/go32v2/vesa.inc
--- Recording mergeinfo for merge of r30246 into '.':
 G   .
--- Merging r30247 into '.':
G    packages/graph/src/go32v2/vesa.inc
U    packages/graph/src/msdos/vesa.inc
--- Recording mergeinfo for merge of r30247 into '.':
 G   .
--- Merging r30248 into '.':
G    packages/graph/src/go32v2/vesa.inc
G    packages/graph/src/msdos/vesa.inc
--- Recording mergeinfo for merge of r30248 into '.':
 G   .
--- Merging r30249 into '.':
G    packages/graph/src/msdos/vesa.inc
U    packages/graph/src/msdos/graph.pp
--- Recording mergeinfo for merge of r30249 into '.':
 G   .
--- Merging r30262 into '.':
G    packages/graph/src/msdos/graph.pp
--- Recording mergeinfo for merge of r30262 into '.':
 G   .
--- Merging r30263 into '.':
G    packages/graph/src/msdos/graph.pp
G    packages/graph/src/msdos/vesa.inc
--- Recording mergeinfo for merge of r30263 into '.':
 G   .
--- Merging r30281 into '.':
G    packages/graph/src/go32v2/graph.pp
--- Recording mergeinfo for merge of r30281 into '.':
 G   .
--- Merging r30282 into '.':
G    packages/graph/src/go32v2/graph.pp
--- Recording mergeinfo for merge of r30282 into '.':
 G   .
--- Merging r30283 into '.':
G    packages/graph/src/go32v2/graph.pp
--- Recording mergeinfo for merge of r30283 into '.':
 G   .
--- Merging r30284 into '.':
U    packages/graph/src/ptcgraph/ptcgraph.pp
--- Recording mergeinfo for merge of r30284 into '.':
 G   .
--- Merging r30285 into '.':
G    packages/graph/src/msdos/graph.pp
--- Recording mergeinfo for merge of r30285 into '.':
 G   .

# revisions: 29781,30246,30247,30248,30249,30262,30263,30281,30282,30283,30284,30285

git-svn-id: branches/fixes_3_0@31104 -
2015-06-17 19:35:36 +00:00
compiler --- Merging r30364 into '.': 2015-06-17 11:17:16 +00:00
ide --- Recording mergeinfo for merge of r30359 into '.': 2015-06-17 08:12:01 +00:00
installer --- Merging r29567 into '.': 2015-02-05 21:02:58 +00:00
packages --- Merging r29781 into '.': 2015-06-17 19:35:36 +00:00
rtl --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +00:00
tests --- Merging r30653 into '.': 2015-06-17 11:23:29 +00:00
utils --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +00:00
.gitattributes --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +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 --- Merging r29434 into '.': 2015-01-13 13:58:55 +00:00
Makefile.fpc --- Merging r29434 into '.': 2015-01-13 13:58:55 +00:00