paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-14 11:09:41 +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,853 Commits 101 Branches 76 Tags 323 MiB
Pascal 89.4%
Makefile 9.3%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
a0da5c15d7
Go to file
marco a0da5c15d7 --- Merging r34038 into '.': 
U    packages/pastojs/tests/tcconverter.pp
--- Recording mergeinfo for merge of r34038 into '.':
 U   .
--- Merging r34065 into '.':
U    packages/fcl-web/src/base/fpoauth2ini.pp
--- Recording mergeinfo for merge of r34065 into '.':
 G   .
--- Merging r34096 into '.':
U    packages/fcl-js/src/jsbase.pp
--- Recording mergeinfo for merge of r34096 into '.':
 G   .
--- Merging r34196 into '.':
U    packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r34196 into '.':
 G   .
--- Merging r34199 into '.':
U    packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r34199 into '.':
 G   .
--- Merging r34202 into '.':
U    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34202 into '.':
 G   .
--- Merging r34204 into '.':
U    packages/fcl-js/tests/testjs.lpr
U    packages/fcl-js/src/jsparser.pp
U    packages/fcl-js/src/jswriter.pp
U    packages/fcl-js/src/jstree.pp
U    packages/fcl-js/src/jstoken.pp
--- Recording mergeinfo for merge of r34204 into '.':
 G   .
--- Merging r34206 into '.':
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34206 into '.':
 G   .
--- Merging r34212 into '.':
G    packages/fcl-js/src/jsbase.pp
--- Recording mergeinfo for merge of r34212 into '.':
 G   .
--- Merging r34213 into '.':
G    packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r34213 into '.':
 G   .
--- Merging r34215 into '.':
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34215 into '.':
 G   .
--- Merging r34217 into '.':
G    packages/fcl-js/src/jswriter.pp
G    packages/fcl-js/src/jstree.pp
--- Recording mergeinfo for merge of r34217 into '.':
 G   .
--- Merging r34218 into '.':
U    packages/pastojs/tests/testpas2js.lpi
G    packages/pastojs/tests/tcconverter.pp
G    packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r34218 into '.':
 G   .
--- Merging r34226 into '.':
U    packages/fcl-js/tests/tcwriter.pp
G    packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r34226 into '.':
 G   .
--- Merging r34227 into '.':
G    packages/pastojs/src/fppas2js.pp
G    packages/pastojs/tests/tcconverter.pp
--- Recording mergeinfo for merge of r34227 into '.':
 G   .

# revisions: 34038,34065,34096,34196,34199,34202,34204,34206,34212,34213,34215,34217,34218,34226,34227

git-svn-id: branches/fixes_3_0@35975 -
2017-04-27 16:34:36 +00:00
compiler * version updates 2017-02-13 08:24:06 +00:00
ide * version updates 2017-02-13 08:24:06 +00:00
installer * version updates 2017-02-13 08:24:06 +00:00
packages --- Merging r34038 into '.': 2017-04-27 16:34:36 +00:00
rtl --- Merging r33007 into '.': 2017-04-22 17:19:11 +00:00
tests * version updates 2017-02-13 08:24:06 +00:00
utils --- Merging r31366 into '.': 2017-04-27 16:09:46 +00:00
.gitattributes --- Merging r31366 into '.': 2017-04-27 16:09:46 +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 * update allowed versions after question from Mattias 2017-03-03 08:26:55 +00:00
Makefile.fpc * update allowed versions after question from Mattias 2017-03-03 08:26:55 +00:00