paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-05 20:50:32 +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,506 Commits 101 Branches 76 Tags 305 MiB
Pascal 89.4%
Makefile 9.3%
WebIDL 0.5%
Assembly 0.2%
AngelScript 0.1%
e0f38f1ba9
Go to file
marco e0f38f1ba9 --- Merging r30384 into '.': 
U    rtl/objpas/sysutils/datih.inc
U    rtl/objpas/sysutils/dati.inc
--- Recording mergeinfo for merge of r30384 into '.':
 U   .
--- Merging r30557 into '.':
G    rtl/objpas/sysutils/dati.inc
--- Recording mergeinfo for merge of r30557 into '.':
 G   .
--- Merging r30575 into '.':
U    packages/fcl-db/src/base/fields.inc
U    packages/fcl-db/src/base/db.pas
U    packages/fcl-web/examples/echo/cgi/echo.lpi
U    packages/fcl-web/examples/echo/webmodule/wmecho.pas
U    packages/fcl-web/examples/echo/fcgi/echo.lpi
U    packages/fcl-web/examples/httpserver/simplehttpserver.pas
U    packages/fcl-web/examples/httpserver/simplehttpserver.lpi
U    packages/fcl-web/tests/testcgiapp.lpi
U    packages/fcl-web/tests/testcgiapp.pp
U    packages/fcl-base/Makefile.fpc
U    packages/fcl-base/src/fptimer.pp
U    packages/rtl-extra/src/unix/clocale.pp
U    packages/fcl-passrc/tests/testpassrc.lpi
U    utils/fpdoc/dglobals.pp
U    utils/fpdoc/testunit.pp
U    utils/fpdoc/makeskel.pp
U    utils/fpdoc/makeskel.lpi
G    rtl/objpas/sysutils/dati.inc
 G   .
--- Recording mergeinfo for merge of r30575 into '.':
 G   .
--- Merging r30576 into '.':
G    utils/fpdoc/dglobals.pp
G    utils/fpdoc/makeskel.lpi
G    utils/fpdoc/testunit.pp
G    utils/fpdoc/makeskel.pp
G    rtl/objpas/sysutils/dati.inc
G    packages/fcl-web/examples/httpserver/simplehttpserver.lpi
G    packages/fcl-web/examples/httpserver/simplehttpserver.pas
G    packages/fcl-web/examples/echo/fcgi/echo.lpi
G    packages/fcl-web/examples/echo/cgi/echo.lpi
G    packages/fcl-web/examples/echo/webmodule/wmecho.pas
G    packages/fcl-web/tests/testcgiapp.pp
G    packages/fcl-web/tests/testcgiapp.lpi
G    packages/rtl-extra/src/unix/clocale.pp
G    packages/fcl-passrc/tests/testpassrc.lpi
G    packages/fcl-base/Makefile.fpc
G    packages/fcl-base/src/fptimer.pp
G    packages/fcl-db/src/base/db.pas
G    packages/fcl-db/src/base/fields.inc
--- Recording mergeinfo for merge of r30576 into '.':
 G   .
--- Merging r30577 into '.':
G    rtl/objpas/sysutils/dati.inc
--- Recording mergeinfo for merge of r30577 into '.':
 G   .
--- Merging r30608 into '.':
U    packages/rtl-objpas/src/inc/dateutil.inc
A    tests/webtbs/tw27832.pp
--- Recording mergeinfo for merge of r30608 into '.':
 G   .
--- Merging r30620 into '.':
G    rtl/objpas/sysutils/dati.inc
--- Recording mergeinfo for merge of r30620 into '.':
 G   .

# revisions: 30384,30557,30575,30576,30577,30608,30620

git-svn-id: branches/fixes_3_0@31077 -
2015-06-17 08:19:59 +00:00
compiler --- Merging r29537 into '.': 2015-06-14 20:35:18 +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 r30384 into '.': 2015-06-17 08:19:59 +00:00
rtl --- Merging r30384 into '.': 2015-06-17 08:19:59 +00:00
tests --- Merging r30384 into '.': 2015-06-17 08:19:59 +00:00
utils --- Merging r29426 into '.': 2015-06-14 20:37:31 +00:00
.gitattributes --- Merging r30384 into '.': 2015-06-17 08:19:59 +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