C packages/fcl-xml/fpmake.pp
C packages/fpmkunit/fpmake.pp
--- Recording mergeinfo for merge of r43915 into '.':
U .
Summary of conflicts:
Text conflicts: 2
Summary of conflicts:
Text conflicts: 2
git-svn-id: branches/fixes_3_2@43980 -
U compiler/i386/n386flw.pas
--- Recording mergeinfo for merge of r42115 into '.':
U .
--- Merging r43830 into '.':
U compiler/i386/cpunode.pas
U compiler/options.pas
--- Recording mergeinfo for merge of r43830 into '.':
G .
git-svn-id: branches/fixes_3_2@43978 -
* license clarifications. Accidental GPL removed. Introduced by me during
*nix reform in a few .incs and those templates got copied around (os* sysc*)
* clarify OS2/EMX license to actually name the license rather than
saying "NOT GPL" and refering to EMX.
git-svn-id: branches/fixes_3_2@43970 -
U packages/amunits/src/coreunits/console.pas
U packages/amunits/src/coreunits/conunit.pas
--- Recording mergeinfo for merge of r43812 into '.':
U .
--- Merging r43814 into '.':
U packages/rtl-console/fpmake.pp
U packages/rtl-console/src/amiga/crt.pp
--- Recording mergeinfo for merge of r43814 into '.':
G .
--- Merging r43815 into '.':
U packages/arosunits/fpmake.pp
A packages/arosunits/src/console.pas
A packages/arosunits/src/conunit.pas
U packages/morphunits/fpmake.pp
A packages/morphunits/src/console.pas
A packages/morphunits/src/conunit.pas
U packages/os4units/fpmake.pp
A packages/os4units/src/console.pas
A packages/os4units/src/conunit.pas
G packages/rtl-console/fpmake.pp
A packages/rtl-console/src/amicommon/crt.pp
D packages/rtl-console/src/amiga
--- Recording mergeinfo for merge of r43815 into '.':
G .
--- Merging r43827 into '.':
G packages/rtl-console/fpmake.pp
U packages/rtl-console/src/amicommon/crt.pp
--- Recording mergeinfo for merge of r43827 into '.':
G .
--- Merging r43847 into '.':
G packages/rtl-console/src/amicommon/crt.pp
--- Recording mergeinfo for merge of r43847 into '.':
G .
--- Merging r43854 into '.':
G packages/rtl-console/src/amicommon/crt.pp
--- Recording mergeinfo for merge of r43854 into '.':
G .
--- Merging r43876 into '.':
G packages/rtl-console/src/amicommon/crt.pp
--- Recording mergeinfo for merge of r43876 into '.':
G .
# revisions: 43812,43814,43815,43827,43847,43854,43876
git-svn-id: branches/fixes_3_2@43959 -
merge of revisions 43773, 43774 and 43775 from trunk to fixes_3_2
------------------------------------------------------------------------
r43773 | svenbarth | 2019-12-24 21:29:51 +0000 (Tue, 24 Dec 2019) | 1 line
* as long as the Comp type is declared, declare PComp as well
------------------------------------------------------------------------
--- Merging r43773 into '.':
U rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43773 into '.':
U .
------------------------------------------------------------------------
r43774 | svenbarth | 2019-12-24 21:29:53 +0000 (Tue, 24 Dec 2019) | 1 line
* if a CPU platform doesn't explicitely provide the Comp type we declare it as an alias to Int64
------------------------------------------------------------------------
--- Merging r43774 into '.':
G rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43774 into '.':
G .
------------------------------------------------------------------------
r43775 | svenbarth | 2019-12-24 21:29:57 +0000 (Tue, 24 Dec 2019) | 1 line
* Delphi allows overloading based on Comp, so declare it as a type rename instead of a mere alias
------------------------------------------------------------------------
--- Merging r43775 into '.':
G rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43775 into '.':
G .
git-svn-id: branches/fixes_3_2@43958 -
U rtl/linux/buildrtl.lpi
U rtl/linux/buildrtl.pp
--- Recording mergeinfo for merge of r43618 into '.':
U .
--- Merging r43669 into '.':
U utils/mkinsadd.pp
--- Recording mergeinfo for merge of r43669 into '.':
G .
# revisions: 43618,43669
git-svn-id: branches/fixes_3_2@43957 -
A .gitignore
--- Recording mergeinfo for merge of r43572 into '.':
U .
--- Merging r43581 into '.':
U .gitignore
--- Recording mergeinfo for merge of r43581 into '.':
G .
--- Merging r43582 into '.':
G .gitignore
--- Recording mergeinfo for merge of r43582 into '.':
G .
--- Merging r43916 into '.':
A packages/ide/fpx64.lpi
--- Recording mergeinfo for merge of r43916 into '.':
G .
# revisions: 43572,43581,43582,43916
git-svn-id: branches/fixes_3_2@43956 -
U packages/Makefile
U packages/Makefile.fpc
U utils/Makefile
U utils/Makefile.fpc
--- Recording mergeinfo for merge of r43892 into '.':
U .
git-svn-id: branches/fixes_3_2@43932 -
U rtl/unix/genfdset.inc
--- Recording mergeinfo for merge of r43324 into '.':
U .
--- Merging r43389 into '.':
U packages/ncurses/src/ncurses.pp
--- Recording mergeinfo for merge of r43389 into '.':
G .
# revisions: 43324,43389
git-svn-id: branches/fixes_3_2@43927 -
U packages/winunits-jedi/src/jediapilib.inc
--- Recording mergeinfo for merge of r43608 into '.':
U .
# revisions: 43608
git-svn-id: branches/fixes_3_2@43926 -
U rtl/objpas/sysutils/sysutilh.inc
U rtl/objpas/sysutils/sysutils.inc
--- Recording mergeinfo for merge of r43826 into '.':
U .
# revisions: 43826
git-svn-id: branches/fixes_3_2@43925 -
U packages/fcl-image/src/fppixlcanv.pp
--- Recording mergeinfo for merge of r43857 into '.':
U .
# revisions: 43857
git-svn-id: branches/fixes_3_2@43924 -
U rtl/netbsd/Makefile
U rtl/netbsd/Makefile.fpc
--- Recording mergeinfo for merge of r42610 into '.':
U .
# revisions: 42610
git-svn-id: branches/fixes_3_2@43922 -
U packages/fcl-registry/src/winreg.inc
A tests/test/packages/fcl-registry/tw35060a.pp
A tests/test/packages/fcl-registry/tw35060b.pp
--- Recording mergeinfo for merge of r41325 into '.':
U .
--- Merging r41352 into '.':
G packages/fcl-registry/src/winreg.inc
--- Recording mergeinfo for merge of r41352 into '.':
G .
--- Merging r41415 into '.':
U packages/fcl-registry/src/registry.pp
U tests/test/packages/fcl-registry/tw35060a.pp
U tests/test/packages/fcl-registry/tw35060b.pp
A tests/test/packages/fcl-registry/tw35060c.pp
--- Recording mergeinfo for merge of r41415 into '.':
G .
--- Merging r41784 into '.':
U packages/fcl-registry/src/regdef.inc
G packages/fcl-registry/src/registry.pp
G packages/fcl-registry/src/winreg.inc
U packages/fcl-registry/src/xmlreg.pp
U packages/fcl-registry/src/xregreg.inc
--- Recording mergeinfo for merge of r41784 into '.':
G .
--- Merging r41785 into '.':
A packages/fcl-registry/examples/testunicode2.pp
--- Recording mergeinfo for merge of r41785 into '.':
G .
git-svn-id: branches/fixes_3_2@43903 -
U packages/fcl-registry/src/registry.pp
U packages/fcl-registry/src/winreg.inc
--- Recording mergeinfo for merge of r41267 into '.':
U .
git-svn-id: branches/fixes_3_2@43902 -
------------------------------------------------------------------------
r43802 | michael | 2019-12-28 15:10:59 +0100 (Sat, 28 Dec 2019) | 1 line
* Fix bug ID #36486, add parameter to force use of largeint for sqlite
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43803 -
------------------------------------------------------------------------
r43713 | michael | 2019-12-23 14:05:59 +0100 (Mon, 23 Dec 2019) | 1 line
* Fix writing of special chars (bug ID 0036470)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43758 -
------------------------------------------------------------------------
r43507 | michael | 2019-11-17 10:33:03 +0100 (Sun, 17 Nov 2019) | 1 line
* Accidentally made all published properties protected
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43755 -
------------------------------------------------------------------------
r43477 | michael | 2019-11-15 15:40:48 +0100 (Fri, 15 Nov 2019) | 1 line
* Fix bug ID #0027891, newer version compaible with 1.3.14
------------------------------------------------------------------------
r43483 | michael | 2019-11-15 18:40:58 +0100 (Fri, 15 Nov 2019) | 1 line
* Forgot to commit
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43751 -
------------------------------------------------------------------------
r43468 | michael | 2019-11-15 12:33:19 +0100 (Fri, 15 Nov 2019) | 1 line
* Fix bug ID #36303, change russian comment with english
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43748 -
------------------------------------------------------------------------
r43435 | michael | 2019-11-10 11:12:05 +0100 (Sun, 10 Nov 2019) | 1 line
* Fix compilation for windows
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43746 -
------------------------------------------------------------------------
r43417 | michael | 2019-11-08 12:43:10 +0100 (Fri, 08 Nov 2019) | 1 line
* Bit helpers for ordinal functions, adapted from batch by Thaddy De Koning (bug ID 0036146)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43745 -
------------------------------------------------------------------------
r43414 | michael | 2019-11-08 09:36:31 +0100 (Fri, 08 Nov 2019) | 1 line
* Reduce use of Length(aValue) in setdelimitedtext
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43742 -
------------------------------------------------------------------------
r43405 | michael | 2019-11-06 11:51:34 +0100 (Wed, 06 Nov 2019) | 1 line
* Add AddDelimitedText,AddCommatext by Werner Pamler (bug ID 36249)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43741 -
