summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* --- Merging r35421 into '.':marco2017-06-041-3/+3
| | | | | | | | | | | U packages/fcl-db/src/sqldb/sqldb.pp --- Recording mergeinfo for merge of r35421 into '.': U . # revisions: 35421 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36415 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36405 into '.':marco2017-06-046-1429/+2433
| | | | | | | | | | | | | | | | | | | U packages/x11/src/keysym.pp --- Recording mergeinfo for merge of r36405 into '.': U . --- Merging r36408 into '.': U packages/x11/fpmake.pp A packages/x11/src/xf86keysym.pp A packages/x11/src/sunkeysym.pp A packages/x11/src/hpkeysym.pp A packages/x11/src/deckeysym.pp --- Recording mergeinfo for merge of r36408 into '.': G . # revisions: 36405,36408 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36414 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36412 into '.':marco2017-06-041-0/+13
| | | | | | | | | | | U rtl/win/wininc/defines.inc --- Recording mergeinfo for merge of r36412 into '.': U . # revisions: 36412 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36413 3ad0048d-3df7-0310-abae-a5850022a9f2
* Fix problem with GNU make 4.Xpierre2017-06-021-1/+5
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36398 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36341 into '.':marco2017-06-011-11/+14
| | | | | | | | | | | U packages/libvlc/src/libvlc.pp --- Recording mergeinfo for merge of r36341 into '.': U . # revisions: 36341 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36385 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36383 into '.':marco2017-06-011-4/+6
| | | | | | | | | | | U packages/fcl-db/src/base/database.inc --- Recording mergeinfo for merge of r36383 into '.': U . # revisions: 36383 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36384 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35545 into '.':marco2017-05-301-4/+6
| | | | | | | | | | | | | | | U compiler/arm/aoptcpu.pas --- Recording mergeinfo for merge of r35545 into '.': U . --- Merging r35552 into '.': G compiler/arm/aoptcpu.pas --- Recording mergeinfo for merge of r35552 into '.': G . # revisions: 35545,35552 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36371 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36343 into '.':marco2017-05-281-1/+1
| | | | | | | | | | | U packages/rtl-objpas/src/inc/variants.pp --- Recording mergeinfo for merge of r36343 into '.': U . # revisions: 36343 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36366 3ad0048d-3df7-0310-abae-a5850022a9f2
* * Merge revisions r36355,r36356,r36357,r36358 from trunk:michael2017-05-287-3/+87
| | | | | | | | | | | | | | | | | | | r36358 | michael | 2017-05-28 10:50:28 +0200 (Sun, 28 May 2017) | 1 line * Patch from Graeme Geldenhuys to test reading human-friendly name r36357 | michael | 2017-05-28 10:49:08 +0200 (Sun, 28 May 2017) | 1 line * Patch from Graeme Geldenhuys to test postscript name and family name r36356 | michael | 2017-05-28 10:48:19 +0200 (Sun, 28 May 2017) | 1 line * Patch from Graeme Geldenhuys to mention one more test r36355 | michael | 2017-05-28 10:47:33 +0200 (Sun, 28 May 2017) | 1 line * Patch from Graeme Geldenhuys to fix failing unit tests git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36364 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36315 into '.':marco2017-05-241-1/+1
| | | | | | | | | | | U rtl/win/wininc/struct.inc --- Recording mergeinfo for merge of r36315 into '.': U . # revisions: 36315 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36316 3ad0048d-3df7-0310-abae-a5850022a9f2
* * copy syserrorformat trunk version to fixes. (manual merge)marco2017-05-221-13/+17
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36291 3ad0048d-3df7-0310-abae-a5850022a9f2
* * Merge revision r36212 from trunk:michael2017-05-202-1/+18
| | | | | | | | | | | ------------------------------------------------------------------------ r36212 | michael | 2017-05-15 09:13:37 +0200 (Mon, 15 May 2017) | 1 line * Patch from Ondrej Pokorny to make Datamodule DPI aware (bug ID 31813) ------------------------------------------------------------------------ git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36272 3ad0048d-3df7-0310-abae-a5850022a9f2
* Fix dosbox_wrapper executable location from commits 32614,32625,6256 and 32628pierre2017-05-072-1/+14
| | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------------------ r32614 | pierre | 2015-12-07 23:54:02 +0100 (Mon, 07 Dec 2015) | 1 line Add explicit rule to compile dosbox_wrapper, executable is put in utils/dosbox directory ------------------------------------------------------------------------ ------------------------------------------------------------------------ r32625 | pierre | 2015-12-10 02:51:15 +0100 (Thu, 10 Dec 2015) | 1 line Add dosbox/dosbox_wrapper to list of programs if EMULATOR variable contains dosbox_wrapper string pattern ------------------------------------------------------------------------ r32626 | pierre | 2015-12-10 02:51:37 +0100 (Thu, 10 Dec 2015) | 1 line Regenerate after: Add dosbox/dosbox_wrapper to list of programs if EMULATOR variable contains dosbox_wrapper string pattern ------------------------------------------------------------------------ git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36152 3ad0048d-3df7-0310-abae-a5850022a9f2
* adapted commit rev 32474: avoid range check error in geasizeint method.pierre2017-05-071-1/+1
| | | | | | | | | | | | ------------------------------------------------------------------------ r32474 | jonas | 2015-11-22 12:49:47 +0100 (Sun, 22 Nov 2015) | 1 line * fixed (harmless) range errors in getasizeint() after r32444 ------------------------------------------------------------------------ git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36151 3ad0048d-3df7-0310-abae-a5850022a9f2
* Update msgtct.inc because copyright year 2017pierre2017-05-061-1/+1
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36132 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35475 into '.':marco2017-05-042-4/+8
| | | | | | | | | | | | U utils/h2pas/h2pas.y U utils/h2pas/h2pas.pas --- Recording mergeinfo for merge of r35475 into '.': U . # revisions: 35475 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36076 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35466 into '.':marco2017-05-041-2/+2
| | | | | | | | | | | U packages/paszlib/src/zipper.pp --- Recording mergeinfo for merge of r35466 into '.': U . # revisions: 35466 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36075 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35520 into '.':marco2017-05-041-0/+4
| | | | | | | | | | | U packages/fcl-net/src/netdb.pp --- Recording mergeinfo for merge of r35520 into '.': U . # revisions: 35520 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36074 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36060 into '.':marco2017-05-021-1/+1
| | | | | | | | | | | U tests/webtbs/tw9419.pp --- Recording mergeinfo for merge of r36060 into '.': U . # revisions: 36060 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36061 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35632 into '.':marco2017-05-021-0/+1
| | | | | | | | | | | U rtl/inc/objpash.inc --- Recording mergeinfo for merge of r35632 into '.': U . # revisions: 35632 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36059 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34485 into '.':marco2017-05-011-93/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | U rtl/objpas/fgl.pp --- Recording mergeinfo for merge of r34485 into '.': U . --- Merging r34872 into '.': G rtl/objpas/fgl.pp --- Recording mergeinfo for merge of r34872 into '.': G . --- Merging r35072 into '.': G rtl/objpas/fgl.pp --- Recording mergeinfo for merge of r35072 into '.': G . --- Merging r35073 into '.': G rtl/objpas/fgl.pp --- Recording mergeinfo for merge of r35073 into '.': G . --- Merging r35942 into '.': G rtl/objpas/fgl.pp --- Recording mergeinfo for merge of r35942 into '.': G . # revisions: 34485,34872,35072,35073,35942 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36052 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34840 into '.':marco2017-05-013-71/+496
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34840 into '.': U . --- Merging r34841 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34841 into '.': G . --- Merging r34842 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34842 into '.': G . --- Merging r34843 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34843 into '.': G . --- Merging r34844 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34844 into '.': G . --- Merging r34845 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34845 into '.': G . --- Merging r34848 into '.': G utils/pas2jni/writer.pas U utils/pas2jni/def.pas U utils/pas2jni/ppuparser.pas --- Recording mergeinfo for merge of r34848 into '.': G . --- Merging r34862 into '.': G utils/pas2jni/def.pas G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34862 into '.': G . --- Merging r34863 into '.': G utils/pas2jni/def.pas G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34863 into '.': G . --- Merging r34951 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34951 into '.': G . --- Merging r34952 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34952 into '.': G . --- Merging r34953 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34953 into '.': G . --- Merging r34954 into '.': G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r34954 into '.': G . --- Merging r35779 into '.': G utils/pas2jni/def.pas G utils/pas2jni/ppuparser.pas G utils/pas2jni/writer.pas --- Recording mergeinfo for merge of r35779 into '.': G . # revisions: 34840,34841,34842,34843,34844,34845,34848,34862,34863,34951,34952,34953,34954,35779 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36051 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35594 into '.':marco2017-05-015-29/+538
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/numlib/src/spe.pas --- Recording mergeinfo for merge of r35594 into '.': U . --- Merging r35687 into '.': G packages/numlib/src/spe.pas --- Recording mergeinfo for merge of r35687 into '.': G . --- Merging r35688 into '.': U packages/numlib/src/typ.pas --- Recording mergeinfo for merge of r35688 into '.': G . --- Merging r35689 into '.': U packages/numlib/src/int.pas U packages/numlib/src/spl.pas --- Recording mergeinfo for merge of r35689 into '.': G . --- Merging r35922 into '.': G packages/numlib/src/spe.pas U packages/numlib/src/roo.pas G packages/numlib/src/typ.pas --- Recording mergeinfo for merge of r35922 into '.': G . # revisions: 35594,35687,35688,35689,35922 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36050 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34871 into '.':marco2017-05-014-0/+87
| | | | | | | | | | | | | | A packages/fcl-base/examples/databom.txt A packages/fcl-base/examples/csvbom.pp U packages/fcl-base/examples/README.txt U packages/fcl-base/src/csvreadwrite.pp --- Recording mergeinfo for merge of r34871 into '.': U . # revisions: 34871 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36049 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r33038 into '.':marco2017-05-012-6/+4
| | | | | | | | | | | | | | | U rtl/inc/heaptrc.pp --- Recording mergeinfo for merge of r33038 into '.': U . --- Merging r35886 into '.': U rtl/inc/exeinfo.pp --- Recording mergeinfo for merge of r35886 into '.': G . # revisions: 33038,35886 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36046 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35548 into '.':marco2017-05-011-1/+1
| | | | | | | | | | | U rtl/bsd/sysctl.pp --- Recording mergeinfo for merge of r35548 into '.': U . # revisions: 35548 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36029 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r33039 into '.':marco2017-05-0118-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U rtl/android/Makefile U rtl/android/Makefile.fpc U rtl/solaris/Makefile U rtl/solaris/Makefile.fpc U rtl/dragonfly/Makefile U rtl/dragonfly/Makefile.fpc U rtl/os2/Makefile U rtl/os2/Makefile.fpc U rtl/netbsd/Makefile U rtl/netbsd/Makefile.fpc U rtl/darwin/Makefile U rtl/darwin/Makefile.fpc U rtl/openbsd/Makefile U rtl/openbsd/Makefile.fpc C rtl/freebsd/Makefile U rtl/freebsd/Makefile.fpc U rtl/linux/Makefile U rtl/linux/Makefile.fpc --- Recording mergeinfo for merge of r33039 into '.': U . Summary of conflicts: Text conflicts: 1 # revisions: 33039 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36028 3ad0048d-3df7-0310-abae-a5850022a9f2
* * patch from Lacak to merge 34962-34963 manually (can't merge directlymarco2017-04-291-27/+50
| | | | | | | due to blocking revs with unicode related conceptual changes) git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36016 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r32032 into '.':marco2017-04-292-15/+18
| | | | | | | | | | | | | | | U installer/install.dat --- Recording mergeinfo for merge of r32032 into '.': U . --- Merging r35433 into '.': U installer/install.pas --- Recording mergeinfo for merge of r35433 into '.': G . # revisions: 32032,35433 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36015 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r31855 into '.':marco2017-04-291-1/+1
| | | | | | | | | | | U packages/rtl-console/src/inc/videoh.inc --- Recording mergeinfo for merge of r31855 into '.': U . # revisions: 31855 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36014 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35607 into '.':marco2017-04-291-12/+13
| | | | | | | | | | | U rtl/objpas/classes/compon.inc --- Recording mergeinfo for merge of r35607 into '.': U . # revisions: 35607 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36013 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34492 into '.':marco2017-04-297-99/+211
| | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-registry/src/xmlreg.pp --- Recording mergeinfo for merge of r34492 into '.': U . --- Merging r35330 into '.': U packages/fcl-registry/tests/testbasics.pp A packages/fcl-registry/tests/tcxmlreg.pp U packages/fcl-registry/tests/regtestframework.pp U packages/fcl-registry/src/xregreg.inc G packages/fcl-registry/src/xmlreg.pp U packages/fcl-registry/src/winreg.inc U packages/fcl-registry/src/registry.pp --- Recording mergeinfo for merge of r35330 into '.': G . --- Merging r35344 into '.': G packages/fcl-registry/src/xmlreg.pp --- Recording mergeinfo for merge of r35344 into '.': G . # revisions: 34492,35330,35344 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36012 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35498 into '.':marco2017-04-291-0/+7
| | | | | | | | | | | U packages/libtar/src/libtar.pp --- Recording mergeinfo for merge of r35498 into '.': U . # revisions: 35498 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36011 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r33998 into '.':marco2017-04-2915-1221/+4820
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-pdf/examples/testfppdf.lpr U packages/fcl-pdf/src/fpttf.pp U packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r33998 into '.': U . --- Merging r34037 into '.': D packages/fcl-pdf/utils/mkpdffontdef.lpi D packages/fcl-pdf/utils/mkpdffontdef.pp --- Recording mergeinfo for merge of r34037 into '.': G . --- Merging r34060 into '.': U packages/fcl-pdf/tests/fpttf_test.pas U packages/fcl-pdf/tests/fpparsettf_test.pas U packages/fcl-pdf/src/fpparsettf.pp G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r34060 into '.': G . --- Merging r34543 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r34543 into '.': G . --- Merging r34563 into '.': G packages/fcl-pdf/examples/testfppdf.lpr U packages/fcl-pdf/tests/fppdf_test.pas G packages/fcl-pdf/src/fpparsettf.pp G packages/fcl-pdf/src/fppdf.pp G packages/fcl-pdf/src/fpttf.pp --- Recording mergeinfo for merge of r34563 into '.': G . --- Merging r34767 into '.': G packages/fcl-pdf/examples/testfppdf.lpr G packages/fcl-pdf/tests/fpparsettf_test.pas G packages/fcl-pdf/src/fpparsettf.pp G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r34767 into '.': G . --- Merging r34778 into '.': G packages/fcl-pdf/src/fppdf.pp G packages/fcl-pdf/examples/testfppdf.lpr --- Recording mergeinfo for merge of r34778 into '.': G . --- Merging r34779 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r34779 into '.': G . --- Merging r34780 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r34780 into '.': G . --- Merging r34781 into '.': G packages/fcl-pdf/examples/testfppdf.lpr G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r34781 into '.': G . --- Merging r34804 into '.': G packages/fcl-pdf/src/fppdf.pp --- Recording mergeinfo for merge of r34804 into '.': G . --- Merging r35083 into '.': G packages/fcl-pdf/examples/testfppdf.lpr U packages/fcl-pdf/utils/ttfdump.lpr U packages/fcl-pdf/utils/ttfdump.lpi U packages/fcl-pdf/fpmake.pp G packages/fcl-pdf/tests/fpparsettf_test.pas G packages/fcl-pdf/tests/fppdf_test.pas G packages/fcl-pdf/tests/fpttf_test.pas A packages/fcl-pdf/src/fontmetrics_stdpdf.inc G packages/fcl-pdf/src/fpparsettf.pp G packages/fcl-pdf/src/fppdf.pp G packages/fcl-pdf/src/fpttf.pp --- Recording mergeinfo for merge of r35083 into '.': G . --- Merging r35084 into '.': A packages/fcl-pdf/src/fpttfsubsetter.pp G packages/fcl-pdf/fpmake.pp --- Recording mergeinfo for merge of r35084 into '.': G . --- Merging r35090 into '.': G packages/fcl-pdf/fpmake.pp A packages/fcl-pdf/src/fpfonttextmapping.pp --- Recording mergeinfo for merge of r35090 into '.': G . --- Merging r35094 into '.': U packages/fcl-pdf/src/fpttfsubsetter.pp --- Recording mergeinfo for merge of r35094 into '.': G . --- Merging r35126 into '.': G packages/fcl-pdf/utils/ttfdump.lpi G packages/fcl-pdf/src/fppdf.pp G packages/fcl-pdf/src/fpttfsubsetter.pp G packages/fcl-pdf/examples/testfppdf.lpr --- Recording mergeinfo for merge of r35126 into '.': G . --- Merging r35131 into '.': G packages/fcl-pdf/src/fppdf.pp G packages/fcl-pdf/src/fpttfsubsetter.pp --- Recording mergeinfo for merge of r35131 into '.': G . --- Merging r35519 into '.': G packages/fcl-pdf/src/fpttfsubsetter.pp --- Recording mergeinfo for merge of r35519 into '.': G . # revisions: 33998,34037,34060,34543,34563,34767,34778,34779,34780,34781,34804,35083,35084,35090,35094,35126,35131,35519 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36010 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35752 into '.':marco2017-04-291-8/+8
| | | | | | | | | | | U packages/ptc/src/dos/timeunit/timeunit.pp --- Recording mergeinfo for merge of r35752 into '.': U . # revisions: 35752 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36009 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34618 into '.':marco2017-04-292-85/+416
| | | | | | | | | | | | | | | U packages/sqlite/src/sqlite3.inc --- Recording mergeinfo for merge of r34618 into '.': U . --- Merging r34867 into '.': U packages/odbc/src/odbcsql.inc --- Recording mergeinfo for merge of r34867 into '.': G . # revisions: 34618,34867 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36008 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35130 into '.':marco2017-04-2815-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | U rtl/beos/sysos.inc U rtl/haiku/sysos.inc U rtl/bsd/sysos.inc U rtl/solaris/signal.inc U rtl/aix/signal.inc U rtl/go32v2/dpmiexcp.pp U rtl/linux/sysos.inc U rtl/netware/nwcalls.pp U rtl/inc/system.inc U rtl/inc/text.inc U rtl/inc/lineinfo.pp U rtl/objpas/classes/reader.inc U rtl/wince/wininc/struct.inc U rtl/java/jsystem.inc --- Recording mergeinfo for merge of r35130 into '.': U . --- Merging r35792 into '.': U rtl/win/wininc/redef.inc --- Recording mergeinfo for merge of r35792 into '.': G . # revisions: 35130,35792 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36005 3ad0048d-3df7-0310-abae-a5850022a9f2
* revs: 34146,34465,34692,34693marco2017-04-283-11/+29
| | | | git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36004 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r30083 into '.':marco2017-04-287-6/+16
| | | | | | | | | | | | | | | | | | | C packages/fpmkunit/src/fpmkunit.pp U packages/sdl/fpmake.pp U packages/rtl-objpas/fpmake.pp U packages/rtl-extra/fpmake.pp U packages/libgd/src/gd.pas U packages/rtl-unicode/fpmake.pp U rtl/nds/rtl.cfg --- Recording mergeinfo for merge of r30083 into '.': U . Summary of conflicts: Text conflicts: 1 # revisions: 30083 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36002 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35877 into '.':marco2017-04-282-9/+10
| | | | | | | | | | | | | | | | | | | U packages/fcl-base/src/custapp.pp --- Recording mergeinfo for merge of r35877 into '.': U . --- Merging r35893 into '.': G packages/fcl-base/src/custapp.pp --- Recording mergeinfo for merge of r35893 into '.': G . --- Merging r35894 into '.': U packages/fcl-base/examples/testapp.pp --- Recording mergeinfo for merge of r35894 into '.': G . # revisions: 35877,35893,35894 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36001 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34727 into '.':marco2017-04-283-30/+42
| | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-base/src/streamex.pp --- Recording mergeinfo for merge of r34727 into '.': U . --- Merging r34728 into '.': G packages/fcl-base/src/streamex.pp --- Recording mergeinfo for merge of r34728 into '.': G . --- Merging r34748 into '.': U packages/fcl-base/src/fptimer.pp --- Recording mergeinfo for merge of r34748 into '.': G . --- Merging r34988 into '.': U packages/fcl-base/src/syncobjs.pp --- Recording mergeinfo for merge of r34988 into '.': G . # revisions: 34727,34728,34748,34988 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36000 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r33772 into '.':marco2017-04-283-12/+23
| | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-base/src/custapp.pp --- Recording mergeinfo for merge of r33772 into '.': U . --- Merging r34294 into '.': U packages/fcl-base/fpmake.pp --- Recording mergeinfo for merge of r34294 into '.': G . --- Merging r34467 into '.': U packages/fcl-base/src/inifiles.pp --- Recording mergeinfo for merge of r34467 into '.': G . --- Merging r34500 into '.': G packages/fcl-base/src/custapp.pp --- Recording mergeinfo for merge of r34500 into '.': G . # revisions: 33772,34294,34467,34500 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35999 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34244 into '.':marco2017-04-289-37/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-db/src/base/dsparams.inc --- Recording mergeinfo for merge of r34244 into '.': U . --- Merging r34556 into '.': U packages/dblib/src/dblib.pp --- Recording mergeinfo for merge of r34556 into '.': G . --- Merging r34745 into '.': U packages/fcl-db/tests/testspecifictbufdataset.pas U packages/fcl-db/src/base/dataset.inc --- Recording mergeinfo for merge of r34745 into '.': G . --- Merging r35465 into '.': U packages/fcl-db/fpmake.pp --- Recording mergeinfo for merge of r35465 into '.': G . --- Merging r35618 into '.': U packages/fcl-db/src/base/bufdataset.pas --- Recording mergeinfo for merge of r35618 into '.': G . --- Merging r35628 into '.': G packages/fcl-db/src/base/dataset.inc --- Recording mergeinfo for merge of r35628 into '.': G . --- Merging r35629 into '.': U packages/fcl-db/tests/testdbbasics.pas --- Recording mergeinfo for merge of r35629 into '.': G . --- Merging r35630 into '.': U packages/fcl-db/src/Dataset.txt --- Recording mergeinfo for merge of r35630 into '.': G . --- Merging r35690 into '.': U packages/fcl-db/src/sqldb/sqldb.pp --- Recording mergeinfo for merge of r35690 into '.': G . # revisions: 34244,34556,34745,35465,35618,35628,35629,35630,35690 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35994 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r33254 into '.':marco2017-04-288-154/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-db/src/sqldb/sqldb.pp U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc --- Recording mergeinfo for merge of r33254 into '.': U . --- Merging r33420 into '.': U packages/fcl-db/tests/testdbbasics.pas U packages/fcl-db/src/base/bufdataset.pas --- Recording mergeinfo for merge of r33420 into '.': G . --- Merging r33421 into '.': G packages/fcl-db/src/base/bufdataset.pas --- Recording mergeinfo for merge of r33421 into '.': G . --- Merging r33422 into '.': G packages/fcl-db/src/base/bufdataset.pas --- Recording mergeinfo for merge of r33422 into '.': G . --- Merging r33427 into '.': G packages/fcl-db/src/base/bufdataset.pas --- Recording mergeinfo for merge of r33427 into '.': G . --- Merging r33570 into '.': G packages/fcl-db/src/sqldb/sqldb.pp --- Recording mergeinfo for merge of r33570 into '.': G . --- Merging r33666 into '.': U packages/fcl-db/tests/toolsunit.pas U packages/fcl-db/tests/sqldbtoolsunit.pas --- Recording mergeinfo for merge of r33666 into '.': G . --- Merging r33905 into '.': U packages/fcl-db/src/sqldb/interbase/fbadmin.pp --- Recording mergeinfo for merge of r33905 into '.': G . --- Merging r33911 into '.': G packages/fcl-db/src/sqldb/interbase/fbadmin.pp --- Recording mergeinfo for merge of r33911 into '.': G . --- Merging r33912 into '.': G packages/fcl-db/src/sqldb/interbase/fbadmin.pp --- Recording mergeinfo for merge of r33912 into '.': G . --- Merging r33913 into '.': U packages/fcl-db/src/sqldb/interbase/fbadmin.pp --- Recording mergeinfo for merge of r33913 into '.': G . --- Merging r34095 into '.': U packages/postgres/src/postgres3dyn.pp --- Recording mergeinfo for merge of r34095 into '.': G . # revisions: 33254,33420,33421,33422,33427,33570,33666,33905,33911,33912,33913,34095 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35993 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35883 into '.':marco2017-04-2718-529/+1951
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-passrc/tests/tcresolver.pas U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35883 into '.': U . --- Merging r35884 into '.': U packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/tests/tcvarparser.pas --- Recording mergeinfo for merge of r35884 into '.': G . --- Merging r35887 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35887 into '.': G . --- Merging r35888 into '.': U packages/pastojs/src/fppas2js.pp U packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35888 into '.': G . --- Merging r35889 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35889 into '.': G . --- Merging r35895 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35895 into '.': G . --- Merging r35896 into '.': U packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35896 into '.': G . --- Merging r35897 into '.': G packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35897 into '.': G . --- Merging r35898 into '.': U packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35898 into '.': G . --- Merging r35902 into '.': U packages/fcl-passrc/tests/tctypeparser.pas G packages/fcl-passrc/tests/tcresolver.pas U packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35902 into '.': G . --- Merging r35903 into '.': G packages/pastojs/tests/tcmodules.pas U packages/pastojs/tests/tcconverter.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35903 into '.': G . --- Merging r35904 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35904 into '.': G . --- Merging r35905 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35905 into '.': G . --- Merging r35908 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35908 into '.': G . --- Merging r35909 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35909 into '.': G . --- Merging r35910 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35910 into '.': G . --- Merging r35911 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35911 into '.': G . --- Merging r35912 into '.': U packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35912 into '.': G . --- Merging r35914 into '.': G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/tests/tcstatements.pas --- Recording mergeinfo for merge of r35914 into '.': G . --- Merging r35915 into '.': G packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35915 into '.': G . --- Merging r35916 into '.': G packages/fcl-passrc/tests/tcclasstype.pas U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r35916 into '.': G . --- Merging r35917 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35917 into '.': G . --- Merging r35919 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35919 into '.': G . --- Merging r35920 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35920 into '.': G . --- Merging r35923 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35923 into '.': G . --- Merging r35926 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35926 into '.': G . --- Merging r35927 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35927 into '.': G . --- Merging r35928 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35928 into '.': G . --- Merging r35931 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35931 into '.': G . --- Merging r35932 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35932 into '.': G . --- Merging r35933 into '.': G packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35933 into '.': G . --- Merging r35938 into '.': U packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35938 into '.': G . --- Merging r35939 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35939 into '.': G . --- Merging r35940 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35940 into '.': G . --- Merging r35947 into '.': G packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35947 into '.': G . --- Merging r35948 into '.': G packages/fcl-passrc/tests/tcclasstype.pas --- Recording mergeinfo for merge of r35948 into '.': G . --- Merging r35949 into '.': G packages/fcl-passrc/tests/tcclasstype.pas --- Recording mergeinfo for merge of r35949 into '.': G . --- Merging r35950 into '.': G packages/fcl-passrc/tests/tctypeparser.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35950 into '.': G . --- Merging r35951 into '.': U packages/fcl-passrc/tests/tcscanner.pas G packages/fcl-passrc/tests/tctypeparser.pas G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35951 into '.': G . --- Merging r35960 into '.': U packages/fcl-passrc/tests/tcexprparser.pas G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35960 into '.': G . --- Merging r35963 into '.': G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r35963 into '.': G . --- Merging r35964 into '.': G packages/fcl-passrc/src/pastree.pp U packages/fcl-passrc/src/passrcutil.pp U packages/fcl-passrc/src/paswrite.pp --- Recording mergeinfo for merge of r35964 into '.': G . --- Merging r35966 into '.': G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/tests/tcexprparser.pas --- Recording mergeinfo for merge of r35966 into '.': G . # revisions: 35883,35884,35887,35888,35889,35895,35896,35897,35898,35902,35903,35904,35905,35908,35909,35910,35911,35912,35914,35915,35916,35917,35919,35920,35923,35926,35927,35928,35931,35932,35933,35938,35939,35940,35947,35948,35949,35950,35951,35960,35963,35964,35966 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35989 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35822 into '.':marco2017-04-2715-2712/+5335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A packages/fcl-web/examples/simpleserver A packages/fcl-web/examples/simpleserver/index.html A packages/fcl-web/examples/simpleserver/README.txt A packages/fcl-web/examples/simpleserver/index.css A packages/fcl-web/examples/simpleserver/simpleserver.pas A packages/fcl-web/examples/simpleserver/simpleserver.lpi --- Recording mergeinfo for merge of r35822 into '.': U . --- Merging r35827 into '.': U packages/fcl-passrc/tests/tcresolver.pas U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35827 into '.': G . --- Merging r35828 into '.': U packages/pastojs/tests/tcmodules.pas U packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35828 into '.': G . --- Merging r35829 into '.': U packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/src/pastree.pp U packages/fcl-passrc/tests/tctypeparser.pas --- Recording mergeinfo for merge of r35829 into '.': G . --- Merging r35839 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35839 into '.': G . --- Merging r35840 into '.': G packages/pastojs/tests/tcmodules.pas U packages/pastojs/tests/tcoptimizations.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35840 into '.': G . --- Merging r35842 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35842 into '.': G . --- Merging r35843 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35843 into '.': G . --- Merging r35844 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35844 into '.': G . --- Merging r35845 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35845 into '.': G . --- Merging r35846 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35846 into '.': G . --- Merging r35847 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35847 into '.': G . --- Merging r35851 into '.': G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas U packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35851 into '.': G . --- Merging r35852 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35852 into '.': G . --- Merging r35853 into '.': G packages/fcl-passrc/src/pasresolver.pp U packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35853 into '.': G . --- Merging r35854 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35854 into '.': G . --- Merging r35859 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35859 into '.': G . --- Merging r35860 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35860 into '.': G . --- Merging r35862 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35862 into '.': G . --- Merging r35863 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35863 into '.': G . --- Merging r35864 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35864 into '.': G . --- Merging r35865 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35865 into '.': G . --- Merging r35866 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35866 into '.': G . --- Merging r35867 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35867 into '.': G . --- Merging r35868 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35868 into '.': G . --- Merging r35869 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35869 into '.': G . --- Merging r35870 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35870 into '.': G . --- Merging r35871 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35871 into '.': G . --- Merging r35872 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35872 into '.': G . --- Merging r35873 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35873 into '.': G . --- Merging r35874 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35874 into '.': G . --- Merging r35875 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35875 into '.': G . --- Merging r35876 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35876 into '.': G . # revisions: 35822,35827,35828,35829,35839,35840,35842,35843,35844,35845,35846,35847,35851,35852,35853,35854,35859,35860,35862,35863,35864,35865,35866,35867,35868,35869,35870,35871,35872,35873,35874,35875,35876 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35988 3ad0048d-3df7-0310-abae-a5850022a9f2
* merged revs: ↵marco2017-04-2713-1294/+5661
| | | | | | 35782,35790,35791,35793,35794,35795,35798,35799,35800,35801,35802,35803,35804,35805,35806,35808,35809,35810,35811 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35987 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35565 into '.':marco2017-04-2734-3326/+17108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-json/tests/testjsonrtti.pp U packages/fcl-json/src/fpjsonrtti.pp --- Recording mergeinfo for merge of r35565 into '.': U . --- Merging r35571 into '.': U packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/tests/testpassrc.lpi A packages/fcl-passrc/tests/tcgenerics.pp U packages/fcl-passrc/tests/tctypeparser.pas U packages/fcl-passrc/tests/testpassrc.lpr --- Recording mergeinfo for merge of r35571 into '.': G . --- Merging r35574 into '.': U packages/pastojs/fpmake.pp --- Recording mergeinfo for merge of r35574 into '.': G . --- Merging r35576 into '.': U packages/fcl-js/src/jsscanner.pp --- Recording mergeinfo for merge of r35576 into '.': G . --- Merging r35577 into '.': U packages/fcl-js/tests/tcwriter.pp U packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35577 into '.': G . --- Merging r35578 into '.': U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r35578 into '.': G . --- Merging r35579 into '.': U packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35579 into '.': G . --- Merging r35580 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35580 into '.': G . --- Merging r35581 into '.': U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35581 into '.': G . --- Merging r35582 into '.': U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35582 into '.': G . --- Merging r35583 into '.': U packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35583 into '.': G . --- Merging r35584 into '.': U packages/fcl-passrc/tests/tcbaseparser.pas --- Recording mergeinfo for merge of r35584 into '.': G . --- Merging r35585 into '.': U packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35585 into '.': G . --- Merging r35586 into '.': G packages/fcl-passrc/tests/testpassrc.lpr A packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/tests/testpassrc.lpi A packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35586 into '.': G . --- Merging r35587 into '.': U packages/pastojs/tests/testpas2js.lpi --- Recording mergeinfo for merge of r35587 into '.': G . --- Merging r35588 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35588 into '.': G . --- Merging r35591 into '.': U packages/fcl-passrc/tests/tcexprparser.pas U packages/fcl-passrc/tests/tcgenerics.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35591 into '.': G . --- Merging r35593 into '.': U packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35593 into '.': G . --- Merging r35597 into '.': U packages/fcl-passrc/tests/tcprocfunc.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r35597 into '.': G . --- Merging r35612 into '.': G packages/fcl-passrc/tests/tcgenerics.pp G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r35612 into '.': G . --- Merging r35613 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35613 into '.': G . --- Merging r35614 into '.': U packages/fcl-passrc/tests/tcuseanalyzer.pas U packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35614 into '.': G . --- Merging r35615 into '.': G packages/pastojs/src/fppas2js.pp U packages/pastojs/tests/testpas2js.pp G packages/pastojs/tests/tcmodules.pas A packages/pastojs/tests/tcoptimizations.pas G packages/pastojs/tests/testpas2js.lpi --- Recording mergeinfo for merge of r35615 into '.': G . --- Merging r35616 into '.': G packages/fcl-passrc/tests/tcgenerics.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35616 into '.': G . --- Merging r35617 into '.': G packages/fcl-passrc/tests/tcgenerics.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35617 into '.': G . --- Merging r35621 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35621 into '.': G . --- Merging r35623 into '.': U packages/fcl-web/src/base/fpweb.pp --- Recording mergeinfo for merge of r35623 into '.': G . --- Merging r35625 into '.': U packages/fcl-passrc/tests/tcscanner.pas G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35625 into '.': G . --- Merging r35631 into '.': U utils/pas2js/dist/rtl.js G packages/fcl-passrc/src/pasresolver.pp G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35631 into '.': G . --- Merging r35633 into '.': G packages/fcl-js/src/jswriter.pp G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp U packages/pastojs/tests/tcconverter.pp G packages/pastojs/tests/tcmodules.pas U packages/pastojs/tests/tcoptimizations.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35633 into '.': G . --- Merging r35635 into '.': G packages/fcl-passrc/tests/testpassrc.lpi U packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35635 into '.': G . --- Merging r35636 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35636 into '.': G . --- Merging r35637 into '.': G packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35637 into '.': G . --- Merging r35638 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35638 into '.': G . --- Merging r35639 into '.': G packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/tests/tcvarparser.pas G packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35639 into '.': G . --- Merging r35640 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35640 into '.': G . --- Merging r35641 into '.': G packages/fcl-passrc/tests/tcstatements.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35641 into '.': G . --- Merging r35642 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35642 into '.': G . --- Merging r35643 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35643 into '.': G . --- Merging r35644 into '.': U packages/fcl-json/src/jsonconf.pp --- Recording mergeinfo for merge of r35644 into '.': G . --- Merging r35648 into '.': U packages/fcl-passrc/fpmake.pp --- Recording mergeinfo for merge of r35648 into '.': G . --- Merging r35651 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35651 into '.': G . --- Merging r35652 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35652 into '.': G . --- Merging r35653 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35653 into '.': G . --- Merging r35667 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35667 into '.': G . --- Merging r35668 into '.': G packages/pastojs/tests/tcconverter.pp G packages/pastojs/tests/tcmodules.pas G packages/pastojs/tests/tcoptimizations.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35668 into '.': G . --- Merging r35680 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35680 into '.': G . --- Merging r35681 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35681 into '.': G . --- Merging r35682 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35682 into '.': G . --- Merging r35683 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35683 into '.': G . --- Merging r35691 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35691 into '.': G . --- Merging r35692 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35692 into '.': G . --- Merging r35693 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35693 into '.': G . --- Merging r35694 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35694 into '.': G . --- Merging r35695 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35695 into '.': G . --- Merging r35696 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35696 into '.': G . --- Merging r35697 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35697 into '.': G . --- Merging r35702 into '.': G packages/fcl-passrc/tests/tcbaseparser.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35702 into '.': G . --- Merging r35703 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35703 into '.': G . --- Merging r35704 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35704 into '.': G . --- Merging r35705 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35705 into '.': G . --- Merging r35706 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35706 into '.': G . --- Merging r35708 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35708 into '.': G . --- Merging r35709 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35709 into '.': G . --- Merging r35710 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35710 into '.': G . --- Merging r35711 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35711 into '.': G . --- Merging r35713 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35713 into '.': G . --- Merging r35714 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35714 into '.': G . --- Merging r35715 into '.': G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35715 into '.': G . --- Merging r35716 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35716 into '.': G . --- Merging r35718 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35718 into '.': G . --- Merging r35719 into '.': G packages/pastojs/src/fppas2js.pp G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35719 into '.': G . --- Merging r35720 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r35720 into '.': G . --- Merging r35728 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35728 into '.': G . --- Merging r35729 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35729 into '.': G . --- Merging r35731 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35731 into '.': G . --- Merging r35732 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35732 into '.': G . --- Merging r35735 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35735 into '.': G . --- Merging r35736 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35736 into '.': G . --- Merging r35737 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r35737 into '.': G . --- Merging r35738 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35738 into '.': G . # revisions: 35565,35571,35574,35576,35577,35578,35579,35580,35581,35582,35583,35584,35585,35586,35587,35588,35591,35593,35597,35612,35613,35614,35615,35616,35617,35621,35623,35625,35631,35633,35635,35636,35637,35638,35639,35640,35641,35642,35643,35644,35648,35651,35652,35653,35667,35668,35680,35681,35682,35683,35691,35692,35693,35694,35695,35696,35697,35702,35703,35704,35705,35706,35708,35709,35710,35711,35713,35714,35715,35716,35718,35719,35720,35728,35729,35731,35732,35735,35736,35737,35738 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35986 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35428 into '.':marco2017-04-2724-2408/+10468
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/pastojs/tests/tcconverter.pp U packages/pastojs/tests/tcmodules.pas U packages/pastojs/src/fppas2js.pp U packages/fcl-js/src/jstree.pp U packages/fcl-passrc/src/pasresolver.pp U packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/src/pastree.pp U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35428 into '.': U . --- Merging r35468 into '.': U packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35468 into '.': G . --- Merging r35469 into '.': G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35469 into '.': G . --- Merging r35470 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r35470 into '.': G . --- Merging r35472 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp U utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r35472 into '.': G . --- Merging r35487 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r35487 into '.': G . --- Merging r35488 into '.': U packages/fcl-passrc/tests/tcbaseparser.pas G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35488 into '.': G . --- Merging r35489 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r35489 into '.': G . --- Merging r35490 into '.': G packages/fcl-js/src/jstree.pp --- Recording mergeinfo for merge of r35490 into '.': G . --- Merging r35491 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r35491 into '.': G . --- Merging r35502 into '.': U packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35502 into '.': G . --- Merging r35503 into '.': G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pastree.pp G packages/fcl-passrc/src/pasresolver.pp U packages/fcl-passrc/src/passrcutil.pp G packages/fcl-passrc/src/pscanner.pp U packages/fcl-passrc/tests/tcexprparser.pas G packages/fcl-passrc/tests/tcresolver.pas U packages/fcl-passrc/tests/tcvarparser.pas --- Recording mergeinfo for merge of r35503 into '.': G . --- Merging r35504 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r35504 into '.': G . --- Merging r35505 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r35505 into '.': G . --- Merging r35512 into '.': U packages/fcl-web/src/base/httpdefs.pp --- Recording mergeinfo for merge of r35512 into '.': G . --- Merging r35513 into '.': G packages/fcl-web/src/base/httpdefs.pp --- Recording mergeinfo for merge of r35513 into '.': G . --- Merging r35514 into '.': U packages/fcl-web/src/base/custcgi.pp --- Recording mergeinfo for merge of r35514 into '.': G . --- Merging r35515 into '.': U packages/fcl-web/src/base/httproute.pp --- Recording mergeinfo for merge of r35515 into '.': G . --- Merging r35516 into '.': U packages/fcl-web/src/base/fphttpclient.pp --- Recording mergeinfo for merge of r35516 into '.': G . --- Merging r35522 into '.': U packages/fcl-passrc/tests/tcclasstype.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r35522 into '.': G . --- Merging r35524 into '.': G packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/tests/tcprocfunc.pas --- Recording mergeinfo for merge of r35524 into '.': G . --- Merging r35561 into '.': U packages/fcl-json/src/fpjsonrtti.pp U packages/fcl-json/tests/testjsonrtti.pp --- Recording mergeinfo for merge of r35561 into '.': G . --- Merging r35562 into '.': G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp U packages/fcl-passrc/tests/tcscanner.pas --- Recording mergeinfo for merge of r35562 into '.': G . # revisions: 35428,35468,35469,35470,35472,35487,35488,35489,35490,35491,35502,35503,35504,35505,35512,35513,35514,35515,35516,35522,35524,35561,35562 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35984 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35292 into '.':marco2017-04-2734-742/+9710
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-web/examples/echo/cgi/echo.lpi U packages/fcl-web/examples/echo/cgi/echo.res U packages/fcl-web/examples/httpclient/httpget.lpi U packages/fcl-web/examples/httpapp/testhttp.pp U packages/fcl-web/examples/httpapp/testhttp.lpi U packages/fcl-web/examples/httpserver/simplehttpserver.lpi A packages/fcl-web/examples/routing A packages/fcl-web/examples/routing/demorouting.lpr A packages/fcl-web/examples/routing/README A packages/fcl-web/examples/routing/demorouting.lpi A packages/fcl-web/examples/routing/routes.pp A packages/fcl-web/examples/routing/sample.ini U packages/fcl-web/fpmake.pp A packages/fcl-web/tests/testfpweb.lpr A packages/fcl-web/tests/tchttproute.pp A packages/fcl-web/tests/testfpweb.lpi U packages/fcl-web/src/base/fphttp.pp A packages/fcl-web/src/base/tcwebmodule.pp U packages/fcl-web/src/base/custweb.pp U packages/fcl-web/src/base/httpdefs.pp U packages/fcl-web/src/base/README.txt A packages/fcl-web/src/base/httproute.pp --- Recording mergeinfo for merge of r35292 into '.': U . --- Merging r35296 into '.': U packages/fcl-json/fpmake.pp A packages/fcl-json/tests/testjson2code.lpr A packages/fcl-json/tests/testjson2code.lpi A packages/fcl-json/tests/tcjsontocode.pp A packages/fcl-json/src/fpjsontopas.pp --- Recording mergeinfo for merge of r35296 into '.': G . --- Merging r35343 into '.': U packages/fcl-json/tests/testjsondata.pp U packages/fcl-json/src/fpjson.pp --- Recording mergeinfo for merge of r35343 into '.': G . --- Merging r35384 into '.': A utils/pas2js/dist A utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r35384 into '.': G . --- Merging r35416 into '.': U packages/fcl-js/src/jsbase.pp U packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35416 into '.': G . --- Merging r35417 into '.': U packages/pastojs/src/fppas2js.pp U packages/pastojs/tests/tcconverter.pp U packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r35417 into '.': G . --- Merging r35418 into '.': U utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r35418 into '.': G . --- Merging r35429 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r35429 into '.': G . --- Merging r35471 into '.': G packages/fcl-js/src/jsbase.pp G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r35471 into '.': G . # revisions: 35292,35296,35343,35384,35416,35417,35418,35429,35471 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@35983 3ad0048d-3df7-0310-abae-a5850022a9f2
View Lorry Controller Status