summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* --- Merging r39844 into '.':fixes_3_0jonas2018-09-303-78/+108
| | | | | | | | | | | | U utils/fpcmkcfg/fpcmkcfg.pp C utils/fpcmkcfg/fpccfg.inc U utils/fpcmkcfg/fpc.cft --- Recording mergeinfo for merge of r39844 into '.': U . git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39845 3ad0048d-3df7-0310-abae-a5850022a9f2
* * export sysnr from the linux unit.marco2018-08-231-0/+1
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39664 3ad0048d-3df7-0310-abae-a5850022a9f2
* * Merge commit 39541 to fixes branch, to allow testing of fixespierre2018-08-021-2/+2
| | | | | | | | | | | ------------------------------------------------------------------------ r39541 | pierre | 2018-08-01 08:44:26 +0200 (Wed, 01 Aug 2018) | 1 line Remove abolute path for native linker, ld is in directory /usr/ccs/bin in Oracle Solaris 10 8/11 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39552 3ad0048d-3df7-0310-abae-a5850022a9f2
* Change the test for GNU make version 4 so that gmake lines are also ↵pierre2018-07-311-2/+3
| | | | | | discarded (needed for systems using GNU make as gmake executable) git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39537 3ad0048d-3df7-0310-abae-a5850022a9f2
* Merge trunk commit 36785, to fix building of shared libs for sparc-linux.pierre2018-07-162-1/+5
| | | | | | | | | | | | ------------------------------------------------------------------------ r36785 | pierre | 2017-07-25 06:51:06 +0000 (Tue, 25 Jul 2017) | 1 line Add -KPIC to ASSHAREDOPT for sparc and sparc64 ------------------------------------------------------------------------ git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39455 3ad0048d-3df7-0310-abae-a5850022a9f2
* * merged on request of Ondrejmarco2018-06-201-4/+6
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39244 3ad0048d-3df7-0310-abae-a5850022a9f2
* Merge most of trunk/tests/utils changes from trunk branch.pierre2018-06-155-217/+765
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge of trunk revision 32622 ------------------------------------------------------------------------ r32622 | nickysn | 2015-12-09 16:56:23 +0100 (Wed, 09 Dec 2015) | 2 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas * on Windows, run dosbox with the swoHIDE option to prevent the annoying focus stealing dosbox consoles from appearing ------------------------------------------------------------------------ Merge of trunk revision 32623 ------------------------------------------------------------------------ r32623 | pierre | 2015-12-10 02:48:18 +0100 (Thu, 10 Dec 2015) | 16 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas + (OutputFileName variable): Add possibility to use output duplicated to a file by a modified dosbox version, using an entry in [dos] section of dosbox.conf cinfig file. copy_con_to_file=/path/to/file/that/will/get/the/copy + (EchoOutput procedure) Write to ouput the content of this file so that it ends up into XXXX.elg file when checking test file XXXX. * Add use_temp_dir boolean variable, set to true by default, can be set to false by setting DOSBOX_NO_TEMPDIR env. variable. + Add hide_execution boolean variable (might only work on Windows), which sets SWOHide to Process.ShowWindow property if true. hide_execution defaults to true, but can be set to true by setting DOSBOX_NO_HIDE to set to false. + Add do_exit boolean variable (defaulting to true), which adds 'exit' as last line into autoexec section in dosbox.conf. Use DOSBOX_NO_EXIT to avoid automatic closing of DosBox at the end of test execution (can bbe useful for debugging purposes). ------------------------------------------------------------------------ Merge of trunk revision 32624 ------------------------------------------------------------------------ r32624 | pierre | 2015-12-10 02:49:37 +0100 (Thu, 10 Dec 2015) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox.conf Change 'exit' to '' to allow to avoid exit at the end of test run ------------------------------------------------------------------------ Merge of trunk revision 32678 ------------------------------------------------------------------------ r32678 | nickysn | 2015-12-18 02:40:22 +0100 (Fri, 18 Dec 2015) | 3 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas * write a message to stdout if dosbox is killed due to a timeout ------------------------------------------------------------------------ Merge of trunk revision 32679 ------------------------------------------------------------------------ r32679 | nickysn | 2015-12-18 02:43:24 +0100 (Fri, 18 Dec 2015) | 5 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas * handle exceptions when opening the exitcode.txt file as well, so that we write a nicer message to stdout in case the file does not exist (which happens often when we kill dosbox, due to a timeout) ------------------------------------------------------------------------ Merge of trunk revision 32696 ------------------------------------------------------------------------ r32696 | nickysn | 2015-12-22 01:05:39 +0100 (Tue, 22 Dec 2015) | 5 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas + support specifying the dosbox timeout (the maximal amount of time a test is allowed to run, before dosbox is killed) via the DOSBOX_TIMEOUT environment variable ------------------------------------------------------------------------ Merge of trunk revision 32697 ------------------------------------------------------------------------ r32697 | nickysn | 2015-12-22 11:01:13 +0100 (Tue, 22 Dec 2015) | 3 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas * increased the default dosbox timeout to 60 seconds ------------------------------------------------------------------------ Merge of trunk revision 32761 ------------------------------------------------------------------------ r32761 | nickysn | 2015-12-27 13:43:01 +0100 (Sun, 27 Dec 2015) | 3 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas * increased the default dosbox timeout to 90 seconds ------------------------------------------------------------------------ Merge of trunk revision 32834 ------------------------------------------------------------------------ r32834 | nickysn | 2016-01-03 12:54:45 +0100 (Sun, 03 Jan 2016) | 3 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas * dosbox timeout increased to 100 seconds ------------------------------------------------------------------------ Merge of trunk revision 33385 ------------------------------------------------------------------------ r33385 | pierre | 2016-03-30 09:42:35 +0200 (Wed, 30 Mar 2016) | 9 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas + Add verbose boolean variable, set to false by default, set to true by setting environment variable DOSBOX_VERBOSE. Most output generated by the wrapper is now only given if verbose is true. + New constant SkipUntilText, default value 'Drive C is mounted as ', allow to discard output generated by dosbox program up to the line containing this string. ------------------------------------------------------------------------ Merge of trunk revision 36230 ------------------------------------------------------------------------ r36230 | pierre | 2017-05-16 22:51:36 +0200 (Tue, 16 May 2017) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox.conf Add disablesplash=true ------------------------------------------------------------------------ Merge of trunk revision 36231 ------------------------------------------------------------------------ r36231 | pierre | 2017-05-16 22:56:29 +0200 (Tue, 16 May 2017) | 9 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas + Add UseSignals macro, which conditionally adds code using signals unit to try to interrupt runaway executables + Global DosBoxProcess TProcess class variable. + Display modified lines inside dosbox.conf if verbose * Try to use Terminate when program exceeds dosbox_timeout (in seconds) * Handle signals if UseSignals macro is set. ------------------------------------------------------------------------ Merge of trunk revision 36313 ------------------------------------------------------------------------ r36313 | pierre | 2017-05-24 09:41:25 +0200 (Wed, 24 May 2017) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas Fix ExitCode readout if temp directory is used by postponing temp directory cleanup ------------------------------------------------------------------------ Merge of trunk revision 36317 ------------------------------------------------------------------------ r36317 | pierre | 2017-05-24 23:53:01 +0200 (Wed, 24 May 2017) | 1 line Changed paths: M /trunk/tests/utils/dbdigest.pp M /trunk/tests/utils/testu.pp Limit log size to 50000, and add all testrun information at start ------------------------------------------------------------------------ Merge of trunk revision 36726 ------------------------------------------------------------------------ r36726 | pierre | 2017-07-11 20:07:43 +0200 (Tue, 11 Jul 2017) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas Search for cwsdpmi DOS exeutable in PATH if DOSBOX_NEEDS_CWSDPMI is set or TEST_OS_TARGET is go32v2 to allow testing go32v2 programs using DOSBOX ------------------------------------------------------------------------ Merge of trunk revision 36992 ------------------------------------------------------------------------ r36992 | svenbarth | 2017-08-20 22:23:50 +0200 (Sun, 20 Aug 2017) | 1 line Changed paths: M /trunk/tests/utils/dotest.pp M /trunk/tests/utils/testu.pp * implement support for copying a central, pre-created configuration file for a test ------------------------------------------------------------------------ Merge of trunk revision 38648 ------------------------------------------------------------------------ r38648 | pierre | 2018-03-30 09:59:14 +0200 (Fri, 30 Mar 2018) | 1 line Changed paths: M /trunk/tests/utils/dotest.pp M /trunk/tests/utils/testu.pp Move several path related functions from dotest program to testu unit for use in dosbox_wrapper program ------------------------------------------------------------------------ Merge of trunk revision 38683 ------------------------------------------------------------------------ r38683 | pierre | 2018-04-04 23:00:26 +0200 (Wed, 04 Apr 2018) | 7 lines Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas * Improve support in temporary directory. + CopyNeededFiles to copy additional files to temp directory. + TempFileList: New variable. * Cleanup: Use TempFileList to delete more file. + Add optional -Ssource_file_name directory. ------------------------------------------------------------------------ Merge of trunk revision 38684 ------------------------------------------------------------------------ r38684 | pierre | 2018-04-04 23:27:07 +0200 (Wed, 04 Apr 2018) | 1 line Changed paths: M /trunk/tests/utils/dotest.pp M /trunk/tests/utils/testu.pp Move GetToken function to testu unit ------------------------------------------------------------------------ Merge of trunk revision 38685 ------------------------------------------------------------------------ r38685 | pierre | 2018-04-04 23:27:36 +0200 (Wed, 04 Apr 2018) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas Add handling of DelFiles ------------------------------------------------------------------------ Merge of trunk revision 38741 ------------------------------------------------------------------------ r38741 | pierre | 2018-04-12 15:44:14 +0200 (Thu, 12 Apr 2018) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox.conf Use auto instead of dynamic, as dynamic is not always possible ------------------------------------------------------------------------ Merge of trunk revision 38742 ------------------------------------------------------------------------ r38742 | pierre | 2018-04-12 15:46:09 +0200 (Thu, 12 Apr 2018) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas Add .exe suffix to ASrcFileName if ADestFileName ends with .exe or if file is not found ------------------------------------------------------------------------ Merge of trunk revision 38816 ------------------------------------------------------------------------ r38816 | pierre | 2018-04-23 00:18:27 +0200 (Mon, 23 Apr 2018) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas Avoid program RTE if failing to remove temporary directory ------------------------------------------------------------------------ Merge of trunk revision 38960 ------------------------------------------------------------------------ r38960 | pierre | 2018-05-09 17:17:40 +0200 (Wed, 09 May 2018) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas Correct copy of files to temp directory and removal of temp directory ------------------------------------------------------------------------ Merge of trunk revision 39197 ------------------------------------------------------------------------ r39197 | pierre | 2018-06-08 10:35:45 +0200 (Fri, 08 Jun 2018) | 1 line Changed paths: M /trunk/tests/utils/dosbox/dosbox_wrapper.pas Report if ExitStatus of DosBox process is non-zero ------------------------------------------------------------------------ git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39236 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36812 into '.':marco2018-03-042-20/+3
| | | | | | | | | | | U packages/fcl-db/src/base/dataset.inc --- Recording mergeinfo for merge of r36812 into '.': U . # revisions: 36812 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@38405 3ad0048d-3df7-0310-abae-a5850022a9f2
* * elf header align pamarco2018-02-161-1/+4
| | | | | | | M compiler/ogelf.pas git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@38260 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r38126 into '.':pierre2018-02-161-0/+8
| | | | | | | | | | | | G packages/hermes/src/hermes.pp --- Recording mergeinfo for merge of r38126 into '.': U . r38126 | pierre | 2018-02-06 10:41:40 +0100 (Tue, 06 Feb 2018) | 1 line Disable i386 assembler code if position independent code option is used git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@38247 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r37714 into '.':marco2018-01-252-1/+2
| | | | | | | | | | | | | | | U packages/chm/src/chmreader.pas --- Recording mergeinfo for merge of r37714 into '.': U . --- Merging r37716 into '.': U packages/chm/src/chmfiftimain.pas --- Recording mergeinfo for merge of r37716 into '.': G . # revisions: 37714,37716 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@38034 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r37854 into '.':marco2018-01-101-1/+7
| | | | | | | | | | | U packages/fcl-web/src/base/fphttpclient.pp --- Recording mergeinfo for merge of r37854 into '.': U . # revisions: 37854 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37943 3ad0048d-3df7-0310-abae-a5850022a9f2
* * Merge fix 37000 for fbadmin AV in lazarus IDEmichael2017-12-291-1/+3
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37857 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r37632 into '.':marco2017-12-061-0/+1
| | | | | | | | | | | U packages/fcl-web/src/base/custweb.pp --- Recording mergeinfo for merge of r37632 into '.': U . # revisions: 37632 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37690 3ad0048d-3df7-0310-abae-a5850022a9f2
* * fixes also to 3.0.4/3.0.2marco2017-12-062-4/+4
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37686 3ad0048d-3df7-0310-abae-a5850022a9f2
* * version updates to 3.0.5marco2017-12-01879-59928/+2371
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37640 3ad0048d-3df7-0310-abae-a5850022a9f2
* Merge of trunk commit number 37207pierre2017-10-301-12/+18
| | | | | | | | | | | ------------------------------------------------------------------------ r37207 | pierre | 2017-09-14 17:13:31 +0200 (Thu, 14 Sep 2017) | 1 line Fix error for jvm compiler ------------------------------------------------------------------------ git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37529 3ad0048d-3df7-0310-abae-a5850022a9f2
* * Merge of several fixes for ppudump tests used in regular tests for ↵pierre2017-10-165-79/+37
| | | | | | | | | | | | | | | | | | | | | | | | | ppudump output. ------------------------------------------------------------------------ r37206 | pierre | 2017-09-14 15:41:06 +0200 (Thu, 14 Sep 2017) | 1 line Fix failures in rtlppulogs ------------------------------------------------------------------------ r37208 | pierre | 2017-09-14 17:57:25 +0200 (Thu, 14 Sep 2017) | 1 line Use installed ppudump instead of trying to recompile it, to be able to test cross-compiled RTL units ------------------------------------------------------------------------ r37210 | pierre | 2017-09-15 13:24:06 +0200 (Fri, 15 Sep 2017) | 1 line Fix the RTL directory for old OSes that use OS_TARGET only for rtlppulogs rule ------------------------------------------------------------------------ r37219 | pierre | 2017-09-15 22:24:06 +0200 (Fri, 15 Sep 2017) | 1 line Also use in path ppudump for ppulogs rule ------------------------------------------------------------------------ git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37476 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r37348 into '.':marco2017-10-011-2/+2
| | | | | | | | | | | | | | | U rtl/objpas/character.pas --- Recording mergeinfo for merge of r37348 into '.': U . --- Merging r37349 into '.': G rtl/objpas/character.pas --- Recording mergeinfo for merge of r37349 into '.': G . # revisions: 37348,37349 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37371 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r37146 into '.':marco2017-09-051-3/+3
| | | | | | | | | | | U packages/winunits-jedi/src/jwawincrypt.pas --- Recording mergeinfo for merge of r37146 into '.': U . # revisions: 37146 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37148 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r37135 into '.':marco2017-09-044-0/+22
| | | | | | | | | | | | | | | | | C utils/fpcm/revision.inc C rtl/objpas/sysutils/filutil.inc U rtl/objpas/sysutils/filutilh.inc U rtl/win/sysutils.pp U rtl/unix/sysutils.pp --- Recording mergeinfo for merge of r37135 into '.': U . Summary of conflicts: Text conflicts: 2 # revisions: 37135 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37138 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36438 into '.':marco2017-09-031-0/+3
| | | | | | | | | | | U utils/creumap.pp --- Recording mergeinfo for merge of r36438 into '.': U . # revisions: 36438 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37132 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36742 into '.':marco2017-09-035-2/+177
| | | | | | | | | | | | | | | U rtl/win/wininc/struct.inc U rtl/win/wininc/unifun.inc U rtl/win/wininc/func.inc U rtl/win/wininc/defines.inc U rtl/win/wininc/ascfun.inc --- Recording mergeinfo for merge of r36742 into '.': U . # revisions: 36742 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37130 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36766 into '.':marco2017-09-032-0/+3
| | | | | | | | | | | | U rtl/win/wininc/base.inc U rtl/win/wininc/defines.inc --- Recording mergeinfo for merge of r36766 into '.': U . # revisions: 36766 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37128 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36774 into '.':marco2017-09-031-2/+124
| | | | | | | | | | | U packages/fcl-image/src/fpimage.pp --- Recording mergeinfo for merge of r36774 into '.': U . # revisions: 36774 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37126 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36923 into '.':marco2017-09-031-4/+12
| | | | | | | | | | | U rtl/inc/system.fpd --- Recording mergeinfo for merge of r36923 into '.': U . # revisions: 36923 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37124 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36858 into '.':marco2017-09-031-1/+1
| | | | | | | | | | | U rtl/unix/oscdeclh.inc --- Recording mergeinfo for merge of r36858 into '.': U . # revisions: 36858 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37122 3ad0048d-3df7-0310-abae-a5850022a9f2
* copied to fixesmarco2017-09-031-0/+27
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37120 3ad0048d-3df7-0310-abae-a5850022a9f2
* * r30023marco2017-09-032-2/+2
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37119 3ad0048d-3df7-0310-abae-a5850022a9f2
* * merged 30017marco2017-09-034-324/+18
| | | | git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37118 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36663 into '.':marco2017-09-011-2/+3
| | | | | | | | | | | U packages/rtl-console/src/win/winevent.pp --- Recording mergeinfo for merge of r36663 into '.': U . # revisions: 36663 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37101 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36642 into '.':marco2017-09-011-1/+1
| | | | | | | | | | | U packages/fv/src/w32smsg.inc --- Recording mergeinfo for merge of r36642 into '.': U . # revisions: 36642 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37100 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36294 into '.':marco2017-09-011-1/+10
| | | | | | | | | | | U packages/gtk2/src/gtk+/gtk/gtkicontheme.inc --- Recording mergeinfo for merge of r36294 into '.': U . # revisions: 36294 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37099 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36139 into '.':marco2017-09-013-3/+3
| | | | | | | | | | | | | U packages/iconvenc/src/iconvenc_dyn.pas U packages/iconvenc/src/iconvert.inc U packages/iconvenc/src/iconvenc.pas --- Recording mergeinfo for merge of r36139 into '.': U . # revisions: 36139 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37098 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35203 into '.':marco2017-09-011-0/+1
| | | | | | | | | | | U rtl/objpas/sysutils/sysstr.inc --- Recording mergeinfo for merge of r35203 into '.': U . # revisions: 35203 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37097 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36747 into '.':marco2017-07-191-7/+13
| | | | | | | | | | | U packages/chm/src/chmfilewriter.pas --- Recording mergeinfo for merge of r36747 into '.': U . # revisions: 36747 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36748 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36729 into '.':marco2017-07-141-0/+5
| | | | | | | | | | | U packages/chm/src/chmfilewriter.pas --- Recording mergeinfo for merge of r36729 into '.': U . # revisions: 36729 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36732 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36585 into '.':marco2017-06-231-3/+3
| | | | | | | | | | | U packages/fcl-base/src/inifiles.pp --- Recording mergeinfo for merge of r36585 into '.': U . # revisions: 36585 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36586 3ad0048d-3df7-0310-abae-a5850022a9f2
* * manually merged r36194, fixes a regression introduced by 3.0.0 on Win64 ↵marco2017-06-221-5/+5
| | | | | | (due to SEH). git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36571 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36498 into '.':marco2017-06-211-1/+1
| | | | | | | | | | | U rtl/objpas/fpwidestring.pp --- Recording mergeinfo for merge of r36498 into '.': U . # revisions: 36498 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36564 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36550 into '.':marco2017-06-213-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | U utils/fppkg/fppkg.pp --- Recording mergeinfo for merge of r36550 into '.': U . --- Merging r36551 into '.': U utils/fpcmkcfg/fppkg.cfg --- Recording mergeinfo for merge of r36551 into '.': G . --- Merging r36552 into '.': G utils/fpcmkcfg/fppkg.cfg --- Recording mergeinfo for merge of r36552 into '.': G . --- Merging r36553 into '.': C utils/fpcmkcfg/fppkg.inc --- Recording mergeinfo for merge of r36553 into '.': G . Summary of conflicts: Text conflicts: 1 # revisions: 36550,36551,36552,36553 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36563 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34401 into '.':marco2017-06-212-1/+16
| | | | | | | | | | | | | | | | | | | U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r34401 into '.': U . --- Merging r34403 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r34403 into '.': G . --- Merging r36529 into '.': U packages/fppkg/src/pkgdownload.pp --- Recording mergeinfo for merge of r36529 into '.': G . # revisions: 34401,34403,36529 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36562 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36510 into '.':marco2017-06-211-5/+10
| | | | | | | | | | | U rtl/win/sysutils.pp --- Recording mergeinfo for merge of r36510 into '.': U . # revisions: 36510 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36561 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35459 into '.':marco2017-06-212-16/+16
| | | | | | | | | | | | U packages/bzip2/src/bzip2.pas U packages/bzip2/src/bzip2stream.pp --- Recording mergeinfo for merge of r35459 into '.': U . # revisions: 35459 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36560 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34476 into '.':marco2017-06-214-23/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/openssl/src/openssl.pas --- Recording mergeinfo for merge of r34476 into '.': U . --- Merging r35332 into '.': G packages/openssl/src/openssl.pas U packages/openssl/src/fpopenssl.pp --- Recording mergeinfo for merge of r35332 into '.': G . --- Merging r35342 into '.': G packages/openssl/src/openssl.pas G packages/openssl/src/fpopenssl.pp --- Recording mergeinfo for merge of r35342 into '.': G . --- Merging r35946 into '.': U rtl/objpas/classes/compon.inc --- Recording mergeinfo for merge of r35946 into '.': G . --- Merging r36062 into '.': U . --- Recording mergeinfo for merge of r36062 into '.': G . --- Merging r36215 into '.': U packages/hash/src/md5.pp --- Recording mergeinfo for merge of r36215 into '.': G . # revisions: 34476,35332,35342,35946,36062,36215 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36559 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r34598 into '.':marco2017-06-21318-2036/+8422
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U compiler/COPYING.txt U packages/gtk2/src/glib/gparamspecs.inc U packages/gtk2/src/gtk+/gdk/gdki18n.inc U packages/gtk2/src/gtk+/gdk/gdkprivate.inc U packages/gtk2/src/gtk+/gtk/gtkhsv.inc U packages/gtk2/src/gtk+/gtk/gtkkeyhash.inc U packages/gtk2/src/gtkext/gtkstatusiconh.inc U packages/sdl/LGPL U packages/googleapi/src/googlediscoverytopas.pp U packages/googleapi/src/googlebase.pp U packages/hermes/src/hermes_palette.inc U packages/hermes/src/hermconf.inc U packages/hermes/src/factconv.inc U packages/hermes/src/p_32.inc U packages/hermes/src/p_24.inc U packages/hermes/src/p_16.inc U packages/hermes/src/p_cnv.inc U packages/hermes/src/p_g.inc U packages/hermes/src/hermes_utility.inc U packages/hermes/src/p_ga.inc U packages/hermes/src/p_gca.inc U packages/hermes/src/p_gac.inc U packages/hermes/src/p_muhmu.inc U packages/hermes/src/p_cpy.inc U packages/hermes/src/hermdef.inc U packages/hermes/src/hermes_converter.inc U packages/hermes/src/hermes_factory.inc U packages/hermes/src/p_gcc.inc U packages/hermes/src/hermes_list.inc U packages/hermes/src/hermes_clearer.inc U packages/hermes/src/headp.inc U packages/hermes/src/i386/mmxp2_32.inc U packages/hermes/src/i386/x86_main.inc U packages/hermes/src/i386/x86p_32.inc U packages/hermes/src/i386/headi386.inc U packages/hermes/src/i386/x86p_16.inc U packages/hermes/src/i386/x86p_s32.inc U packages/hermes/src/i386/x86p_cpy.inc U packages/hermes/src/i386/mmx_clr.inc U packages/hermes/src/i386/x8616lut.inc U packages/hermes/src/i386/headmmx.inc U packages/hermes/src/i386/x86pscpy.inc U packages/hermes/src/i386/mmx_main.inc U packages/hermes/src/i386/mmxp_32.inc U packages/hermes/src/i386/x86_clr.inc U packages/hermes/src/i386/x86p_i8.inc U packages/hermes/src/hermes_dither.inc U packages/hermes/src/x86_64/x86_64_i8.inc U packages/hermes/src/d_32.inc U packages/hermes/src/hermes_debug.inc U packages/hermes/src/hermes.pp U packages/hermes/src/hermes_format.inc U packages/hermes/src/p_clr.inc U packages/hermes/src/p_i8.inc U packages/fcl-db/src/sqlite/customsqliteds.pas U packages/fcl-db/src/sqlite/sqliteds.pas U packages/fcl-db/src/sqlite/sqlite3ds.pas U packages/fcl-db/src/sqldb/sqlite/sqlite3backup.pas U packages/fcl-db/src/sqldb/postgres/pqeventmonitor.pp U packages/fcl-db/src/sqldb/interbase/fbeventmonitor.pp U packages/fcl-db/src/sqldb/interbase/fbadmin.pp U packages/matroska/src/matroska.pas U packages/ptc/src/win32/directx/win32directxcheck.inc U packages/ptc/src/win32/directx/win32directxtranslate.inc U packages/ptc/src/win32/directx/win32directxhook.inc U packages/ptc/src/win32/directx/win32directxprimary.inc U packages/ptc/src/win32/directx/win32directxhookd.inc U packages/ptc/src/win32/directx/win32directxlibrary.inc U packages/ptc/src/win32/directx/win32directxdisplay.inc U packages/ptc/src/win32/directx/win32directxconsoled.inc U packages/ptc/src/win32/directx/win32directxprimaryd.inc U packages/ptc/src/win32/directx/win32directxlibraryd.inc U packages/ptc/src/win32/directx/win32directxdisplayd.inc U packages/ptc/src/win32/directx/win32directxconsolei.inc U packages/ptc/src/win32/gdi/win32gdiconsolei.inc U packages/ptc/src/win32/gdi/win32modesetterd.inc U packages/ptc/src/win32/gdi/win32openglwindowd.inc U packages/ptc/src/win32/gdi/win32dibd.inc U packages/ptc/src/win32/gdi/win32modesetteri.inc U packages/ptc/src/win32/gdi/win32openglwindowi.inc U packages/ptc/src/win32/gdi/win32dibi.inc U packages/ptc/src/win32/gdi/win32gdihookd.inc U packages/ptc/src/win32/gdi/win32gdiconsoled.inc U packages/ptc/src/win32/gdi/win32gdihooki.inc U packages/ptc/src/win32/base/win32hook.inc U packages/ptc/src/win32/base/win32kbd.inc U packages/ptc/src/win32/base/win32mousei.inc U packages/ptc/src/win32/base/win32hookd.inc U packages/ptc/src/win32/base/win32kbdd.inc U packages/ptc/src/win32/base/win32resized.inc U packages/ptc/src/win32/base/win32window.inc U packages/ptc/src/win32/base/win32resizei.inc U packages/ptc/src/win32/base/win32windowd.inc U packages/ptc/src/win32/base/win32cursor.inc U packages/ptc/src/win32/base/win32event.inc U packages/ptc/src/win32/base/win32cursord.inc U packages/ptc/src/win32/base/win32eventd.inc U packages/ptc/src/win32/base/win32cursormoded.inc U packages/ptc/src/win32/base/win32monitor.inc U packages/ptc/src/win32/base/win32monitord.inc U packages/ptc/src/win32/base/win32moused.inc U packages/ptc/src/cocoa/cocoaconsolei.inc U packages/ptc/src/cocoa/cocoaconsoled.inc U packages/ptc/src/ptc.pp U packages/ptc/src/dos/textfx2/textfx2consoled.inc U packages/ptc/src/dos/textfx2/textfx2consolei.inc U packages/ptc/src/dos/base/mousei.inc U packages/ptc/src/dos/base/kbdd.inc U packages/ptc/src/dos/base/mouse33h.pp U packages/ptc/src/dos/base/moused.inc U packages/ptc/src/dos/base/kbd.inc U packages/ptc/src/dos/cga/cga.pp U packages/ptc/src/dos/cga/cgaconsoled.inc U packages/ptc/src/dos/cga/cgaconsolei.inc U packages/ptc/src/dos/vga/vgaconsolei.inc U packages/ptc/src/dos/vga/vga.pp U packages/ptc/src/dos/vga/vgaconsoled.inc U packages/ptc/src/dos/timeunit/timeunit.pp U packages/ptc/src/dos/vesa/vesaconsolei.inc U packages/ptc/src/dos/vesa/vesa.pp U packages/ptc/src/dos/vesa/vesaconsoled.inc U packages/ptc/src/wince/gapi/wincegapiconsolei.inc U packages/ptc/src/wince/gapi/wincegapiconsoled.inc U packages/ptc/src/wince/gdi/wincebitmapinfoi.inc U packages/ptc/src/wince/gdi/wincegdiconsoled.inc U packages/ptc/src/wince/gdi/wincebitmapinfod.inc U packages/ptc/src/wince/gdi/wincegdiconsolei.inc U packages/ptc/src/wince/base/wincekeyboardi.inc U packages/ptc/src/wince/base/wincewindowd.inc U packages/ptc/src/wince/base/wincemoused.inc U packages/ptc/src/wince/base/wincewindowi.inc U packages/ptc/src/wince/base/wincemousei.inc U packages/ptc/src/wince/base/wincekeyboardd.inc U packages/ptc/src/ptcwrapper/ptcwrapper.pp U packages/ptc/src/ptcwrapper/ptceventqueue.pp U packages/ptc/src/core/closeeventd.inc U packages/ptc/src/core/consolei.inc U packages/ptc/src/core/resizeeventi.inc U packages/ptc/src/core/closeeventi.inc U packages/ptc/src/core/eventd.inc U packages/ptc/src/core/moded.inc U packages/ptc/src/core/eventi.inc U packages/ptc/src/core/modei.inc U packages/ptc/src/core/openglattributesd.inc U packages/ptc/src/core/clipperd.inc U packages/ptc/src/core/openglattributesi.inc U packages/ptc/src/core/clipperi.inc U packages/ptc/src/core/aread.inc U packages/ptc/src/core/copyd.inc U packages/ptc/src/core/log.inc U packages/ptc/src/core/areai.inc U packages/ptc/src/core/colord.inc U packages/ptc/src/core/copyi.inc U packages/ptc/src/core/timerd.inc U packages/ptc/src/core/basesurfaced.inc U packages/ptc/src/core/colori.inc U packages/ptc/src/core/timeri.inc U packages/ptc/src/core/cleard.inc U packages/ptc/src/core/surfaced.inc U packages/ptc/src/core/basesurfacei.inc U packages/ptc/src/core/formatd.inc U packages/ptc/src/core/errord.inc U packages/ptc/src/core/mouseeventd.inc U packages/ptc/src/core/keyeventd.inc U packages/ptc/src/core/cleari.inc U packages/ptc/src/core/surfacei.inc U packages/ptc/src/core/baseconsoled.inc U packages/ptc/src/core/formati.inc U packages/ptc/src/core/paletted.inc U packages/ptc/src/core/errori.inc U packages/ptc/src/core/keyeventi.inc U packages/ptc/src/core/mouseeventi.inc U packages/ptc/src/core/baseconsolei.inc U packages/ptc/src/core/consoled.inc U packages/ptc/src/core/palettei.inc U packages/ptc/src/core/resizeeventd.inc U packages/ptc/src/x11/x11glxfbconfigd.inc U packages/ptc/src/x11/x11windowdisplayd.inc U packages/ptc/src/x11/x11glxfbconfigi.inc U packages/ptc/src/x11/x11unikey.inc U packages/ptc/src/x11/x11windowdisplayi.inc U packages/ptc/src/x11/x11consoled.inc U packages/ptc/src/x11/x11dga1displayd.inc U packages/ptc/src/x11/x11dga2displayd.inc U packages/ptc/src/x11/x11displayd.inc U packages/ptc/src/x11/x11consolei.inc U packages/ptc/src/x11/x11dga1displayi.inc U packages/ptc/src/x11/x11modesd.inc U packages/ptc/src/x11/x11dga2displayi.inc U packages/ptc/src/x11/x11check.inc U packages/ptc/src/x11/x11displayi.inc U packages/ptc/src/x11/x11modesi.inc U packages/ptc/src/x11/x11imaged.inc U packages/ptc/src/x11/x11imagei.inc U packages/ptc/src/c_api/capi_copyd.inc U packages/ptc/src/c_api/capi_color.inc U packages/ptc/src/c_api/capi_timer.inc U packages/ptc/src/c_api/capi_colord.inc U packages/ptc/src/c_api/capi_mode.inc U packages/ptc/src/c_api/capi_timerd.inc U packages/ptc/src/c_api/capi_clear.inc U packages/ptc/src/c_api/capi_except.inc U packages/ptc/src/c_api/capi_format.inc U packages/ptc/src/c_api/capi_key.inc U packages/ptc/src/c_api/capi_moded.inc U packages/ptc/src/c_api/capi_surface.inc U packages/ptc/src/c_api/capi_error.inc U packages/ptc/src/c_api/capi_cleard.inc U packages/ptc/src/c_api/capi_surfaced.inc U packages/ptc/src/c_api/capi_keyd.inc U packages/ptc/src/c_api/capi_formatd.inc U packages/ptc/src/c_api/capi_exceptd.inc U packages/ptc/src/c_api/capi_errord.inc U packages/ptc/src/c_api/capi_palette.inc U packages/ptc/src/c_api/capi_clipper.inc U packages/ptc/src/c_api/capi_paletted.inc U packages/ptc/src/c_api/capi_clipperd.inc U packages/ptc/src/c_api/capi_console.inc U packages/ptc/src/c_api/capi_consoled.inc U packages/ptc/src/c_api/capi_index.inc U packages/ptc/src/c_api/capi_area.inc U packages/ptc/src/c_api/capi_copy.inc U packages/ptc/src/c_api/capi_aread.inc U packages/ptc/docs/lgpl.txt U packages/fcl-base/src/csvdocument.pp U packages/fcl-base/src/csvreadwrite.pp U packages/winunits-base/src/eventsink.pp U packages/winunits-base/src/typelib.pas U packages/mysql/src/mysql4_com.pp U packages/mysql/src/mysql.inc U packages/mysql/src/mysql4_comdyn.pp U packages/mysql/src/mysql4dyn.pp U packages/chm/src/paslzxcomp.pas U packages/aspell/LICENSE U packages/os2units/src/dive.pas U packages/bfd/src/bfd.pas U utils/instantfpc/instantfpc.pas U utils/fpdoc/COPYING.txt U utils/fpdoc/README.txt U utils/fppkg/lnet/LICENSE.ADDON U utils/fppkg/lnet/lmimetypes.pp U utils/fppkg/lnet/lhttputil.pp U utils/fppkg/lnet/lprocess.pp U utils/fppkg/lnet/lhttp.pp U utils/fppkg/lnet/ltimer.pp U utils/fppkg/lnet/lfastcgi.pp U utils/fppkg/lnet/lspawnfcgi.pp U utils/fppkg/lnet/lsmtp.pp U utils/fppkg/lnet/lnet.pp U utils/fppkg/lnet/lmimestreams.pp U utils/fppkg/lnet/lmimewrapper.pp U utils/fppkg/lnet/lcommon.pp U utils/fppkg/lnet/LICENSE U utils/fppkg/lnet/lftp.pp U utils/fppkg/lnet/ltelnet.pp U utils/fppkg/lnet/lstrbuffer.pp U utils/fppkg/lnet/lwebserver.pp U utils/fppkg/lnet/levents.pp U utils/fppkg/lnet/lcontrolstack.pp U rtl/sparc/setjumph.inc U rtl/win/wininc/struct.inc U rtl/win/wininc/unifun.inc U rtl/win/wininc/ascdef.inc U rtl/win/wininc/messages.inc U rtl/win/wininc/base.inc U rtl/win/wininc/unidef.inc U rtl/win/wininc/func.inc U rtl/win/wininc/errors.inc U rtl/win/wininc/defines.inc U rtl/win/wininc/ascfun.inc U rtl/linux/powerpc/cprt0.as U rtl/linux/arm/ucprt0.as U rtl/linux/powerpc64/cprt0.as U rtl/linux/powerpc64/gprt0.as U rtl/linux/mips/cprt0.as U rtl/os2/moncalls.pas U rtl/os2/viocalls.pas U rtl/os2/pmgpi.pas U rtl/os2/moucalls.pas U rtl/os2/kbdcalls.pas U rtl/inc/flt_conv.inc U rtl/inc/flt_core.inc U rtl/wince/wininc/struct.inc U rtl/wince/wininc/messages.inc U rtl/wince/wininc/base.inc U rtl/wince/wininc/errors.inc U rtl/wince/wininc/defines.inc U rtl/java/jsystem.inc U rtl/COPYING.txt U tests/test/units/sysutils/twstrcmp.pp U tests/test/units/sysutils/tstrcmp.pp U tests/test/units/sysutils/tastrcmp.pp U tests/utils/avx/avxtestgenerator.pp U tests/utils/avx/baselist.pas U tests/utils/avx/asmtestgenerator.pas U tests/utils/avx/options.pas --- Recording mergeinfo for merge of r34598 into '.': U . --- Merging r35481 into '.': U packages/graph/src/inc/gtext.inc --- Recording mergeinfo for merge of r35481 into '.': G . --- Merging r36507 into '.': G packages/ptc/src/dos/timeunit/timeunit.pp D packages/ptc/src/dos/base/go32fix.pp G packages/ptc/src/core/keyeventd.inc G packages/ptc/src/core/mouseeventd.inc G packages/ptc/src/core/baseconsoled.inc G packages/ptc/src/core/errori.inc G packages/ptc/src/core/baseconsolei.inc G packages/ptc/src/core/consolei.inc U packages/ptc/src/ptcpas.cfg A packages/ptc/src/ptclaz.lpr G packages/ptc/src/x11/x11consolei.inc G packages/ptc/src/x11/x11dga1displayi.inc G packages/ptc/src/x11/x11dga2displayi.inc G packages/ptc/src/x11/x11displayi.inc U packages/ptc/src/x11/x11extensions.inc G packages/ptc/src/x11/x11windowdisplayd.inc G packages/ptc/src/x11/x11unikey.inc G packages/ptc/src/x11/x11windowdisplayi.inc G packages/ptc/src/x11/x11consoled.inc G packages/ptc/src/x11/x11dga1displayd.inc G packages/ptc/src/x11/x11dga2displayd.inc G packages/ptc/src/x11/x11displayd.inc A packages/ptc/src/ptclaz.lpi G packages/ptc/src/win32/base/win32moused.inc G packages/ptc/src/win32/base/win32kbd.inc G packages/ptc/src/win32/base/win32hook.inc G packages/ptc/src/win32/base/win32mousei.inc G packages/ptc/src/win32/base/win32kbdd.inc G packages/ptc/src/win32/base/win32window.inc G packages/ptc/src/win32/base/win32windowd.inc U packages/ptc/src/win32/directx/p_ddraw.pp G packages/ptc/src/win32/directx/win32directxhook.inc A packages/ptc/src/win32/directx/p_dinput.pp G packages/ptc/src/win32/directx/win32directxdisplay.inc G packages/ptc/src/win32/directx/win32directxconsoled.inc G packages/ptc/src/win32/directx/win32directxconsolei.inc G packages/ptc/src/win32/gdi/win32gdiconsoled.inc G packages/ptc/src/win32/gdi/win32gdiconsolei.inc G packages/ptc/src/win32/gdi/win32openglwindowd.inc G packages/ptc/src/win32/gdi/win32openglwindowi.inc G packages/ptc/src/ptc.pp U packages/ptc/docs/INSTALL.txt U packages/ptc/docs/CHANGES.txt U packages/ptc/docs/README.txt U packages/ptc/examples/keyboard3.pp U packages/ptc/fpmake.pp A packages/ptc/tests/event.pp U packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r36507 into '.': G . --- Merging r36508 into '.': G packages/ptc/fpmake.pp --- Recording mergeinfo for merge of r36508 into '.': G . --- Merging r36509 into '.': U packages/ptc/src/dos/textfx2/textfx2.pp G packages/ptc/src/dos/base/mouse33h.pp G packages/ptc/src/dos/cga/cga.pp G packages/ptc/src/dos/vga/vga.pp G packages/ptc/src/dos/vesa/vesa.pp --- Recording mergeinfo for merge of r36509 into '.': G . --- Merging r36555 into '.': U packages/graph/src/ptcgraph/ptccrt.pp G packages/ptc/src/core/keyeventd.inc G packages/ptc/src/x11/x11displayi.inc G packages/ptc/src/win32/base/win32kbd.inc G packages/ptc/docs/CHANGES.txt A packages/ptc/tests/crtkeys A packages/ptc/tests/crtkeys/crtkeys_go32v2.txt A packages/ptc/tests/crtkeys/crtkeys.pas A packages/ptc/tests/crtkeys/crtkeys_tp7.txt A packages/ptc/tests/crtkeys/ptccrtkeys.pas A packages/ptc/tests/crtkeys/crtkeys_fpwincrt.txt --- Recording mergeinfo for merge of r36555 into '.': G . --- Merging r36556 into '.': G packages/graph/src/ptcgraph/ptccrt.pp G packages/ptc/src/win32/base/win32kbd.inc --- Recording mergeinfo for merge of r36556 into '.': G . # revisions: 34598,35481,36507,36508,36509,36555,36556 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36558 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36085 into '.':marco2017-06-193-255/+852
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36085 into '.': U . --- Merging r36118 into '.': U packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36118 into '.': G . --- Merging r36156 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36156 into '.': G . --- Merging r36172 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36172 into '.': G . --- Merging r36236 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36236 into '.': G . --- Merging r36242 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r36242 into '.': G . --- Merging r36247 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36247 into '.': G . --- Merging r36319 into '.': G packages/pastojs/tests/tcmodules.pas U packages/pastojs/tests/tcoptimizations.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36319 into '.': G . --- Merging r36459 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r36459 into '.': G . --- Merging r36460 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36460 into '.': G . # revisions: 36085,36118,36156,36172,36236,36242,36247,36319,36459,36460 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36538 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r33947 into '.':marco2017-06-194-133/+1486
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-base/src/fpexprpars.pp U packages/fcl-base/tests/fclbase-unittests.lpi U packages/fcl-base/tests/testexprpars.pp U packages/fcl-base/tests/fclbase-unittests.pp --- Recording mergeinfo for merge of r33947 into '.': U . --- Merging r33986 into '.': G packages/fcl-base/src/fpexprpars.pp --- Recording mergeinfo for merge of r33986 into '.': G . --- Merging r34377 into '.': G packages/fcl-base/src/fpexprpars.pp G packages/fcl-base/tests/testexprpars.pp --- Recording mergeinfo for merge of r34377 into '.': G . --- Merging r34422 into '.': G packages/fcl-base/tests/testexprpars.pp G packages/fcl-base/src/fpexprpars.pp --- Recording mergeinfo for merge of r34422 into '.': G . --- Merging r34423 into '.': G packages/fcl-base/src/fpexprpars.pp G packages/fcl-base/tests/testexprpars.pp --- Recording mergeinfo for merge of r34423 into '.': G . --- Merging r34967 into '.': G packages/fcl-base/tests/testexprpars.pp G packages/fcl-base/src/fpexprpars.pp --- Recording mergeinfo for merge of r34967 into '.': G . --- Merging r35006 into '.': G packages/fcl-base/src/fpexprpars.pp --- Recording mergeinfo for merge of r35006 into '.': G . # revisions: 33947,33986,34377,34422,34423,34967,35006 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36537 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r36400 into '.':marco2017-06-1910-89/+554
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-image/examples/drawing.pp A packages/fcl-image/examples/pattern.png --- Recording mergeinfo for merge of r36400 into '.': U . --- Merging r36401 into '.': U packages/fcl-image/examples/imgconv.pp --- Recording mergeinfo for merge of r36401 into '.': G . --- Merging r36402 into '.': A packages/fcl-image/examples/textout.pp U packages/fcl-image/src/freetype.pp U packages/fcl-image/src/fpcdrawh.inc U packages/fcl-image/src/fpcanvas.inc U packages/fcl-image/src/fpcanvas.pp U packages/fcl-image/src/ftfont.pp --- Recording mergeinfo for merge of r36402 into '.': G . --- Merging r36403 into '.': U packages/fcl-image/src/fppixlcanv.pp --- Recording mergeinfo for merge of r36403 into '.': G . --- Merging r36404 into '.': G packages/fcl-image/examples/drawing.pp --- Recording mergeinfo for merge of r36404 into '.': G . # revisions: 36400,36401,36402,36403,36404 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36536 3ad0048d-3df7-0310-abae-a5850022a9f2
* --- Merging r35789 into '.':marco2017-06-199-311/+1219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U packages/fcl-js/src/jstree.pp --- Recording mergeinfo for merge of r35789 into '.': U . --- Merging r36007 into '.': U packages/pastojs/tests/tcoptimizations.pas --- Recording mergeinfo for merge of r36007 into '.': G . --- Merging r36035 into '.': U packages/pastojs/src/fppas2js.pp U packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r36035 into '.': G . --- Merging r36037 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r36037 into '.': G . --- Merging r36070 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r36070 into '.': G . --- Merging r36235 into '.': G packages/fcl-js/src/jstree.pp --- Recording mergeinfo for merge of r36235 into '.': G . --- Merging r36471 into '.': G packages/fcl-js/src/jstree.pp --- Recording mergeinfo for merge of r36471 into '.': G . --- Merging r36492 into '.': A packages/fcl-js/tests/tcsrcmap.pas U packages/fcl-js/tests/testjs.lpi U packages/fcl-js/tests/testjs.lpr U packages/fcl-js/src/jswriter.pp A packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r36492 into '.': G . --- Merging r36493 into '.': U packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r36493 into '.': G . --- Merging r36494 into '.': G packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r36494 into '.': G . # revisions: 35789,36007,36035,36037,36070,36235,36471,36492,36493,36494 git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36535 3ad0048d-3df7-0310-abae-a5850022a9f2
View Lorry Controller Status