Commit Graph

54441 Commits

Author SHA1 Message Date
michael
0fbf02d8e4 * Merging revisions 43140 from trunk:
------------------------------------------------------------------------
    r43140 | michael | 2019-10-06 13:21:00 +0200 (Sun, 06 Oct 2019) | 1 line
    
    * Add defaults
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43247 -
2019-10-19 14:44:18 +00:00
michael
fc29eebcdd * Merging revisions 43139 from trunk:
------------------------------------------------------------------------
    r43139 | michael | 2019-10-06 13:20:20 +0200 (Sun, 06 Oct 2019) | 1 line
    
    * Fix bug ID #32625: added several firebird constructs
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43246 -
2019-10-19 14:43:56 +00:00
michael
9e73870256 * Merging revisions 43105 from trunk:
------------------------------------------------------------------------
    r43105 | michael | 2019-10-02 09:26:54 +0200 (Wed, 02 Oct 2019) | 1 line
    
    * Introduce codepage, bug ID #0016587
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43245 -
2019-10-19 14:43:38 +00:00
michael
afbfdaaf91 * Merging revisions 43041 from trunk:
------------------------------------------------------------------------
    r43041 | michael | 2019-09-19 19:14:49 +0200 (Thu, 19 Sep 2019) | 1 line
    
    * Lazarus project file for json test
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43244 -
2019-10-19 14:43:12 +00:00
michael
bcbe47d0de * Merging revisions 43040 from trunk:
------------------------------------------------------------------------
    r43040 | michael | 2019-09-19 19:11:55 +0200 (Thu, 19 Sep 2019) | 1 line
    
    command-line version of test progam
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43243 -
2019-10-19 14:42:50 +00:00
michael
b23d37325b * Merging revisions 43035 from trunk:
------------------------------------------------------------------------
    r43035 | michael | 2019-09-19 09:40:26 +0200 (Thu, 19 Sep 2019) | 1 line
    
    * Added test for bug ID #36086 (lookup on empty dataset)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43242 -
2019-10-19 14:41:47 +00:00
michael
fb9be3b79b * Merging revisions 43034 from trunk:
------------------------------------------------------------------------
    r43034 | michael | 2019-09-19 09:35:38 +0200 (Thu, 19 Sep 2019) | 1 line
    
    * Fix bug #36086 (Lookup causes AV if dataset is empty)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43241 -
2019-10-19 14:41:35 +00:00
michael
cd46a3fdf3 * Merging revisions 43025 from trunk:
------------------------------------------------------------------------
    r43025 | michael | 2019-09-17 11:54:13 +0200 (Tue, 17 Sep 2019) | 1 line
    
    * Fix bug #36080, add wirecompression to IBConnection
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43240 -
2019-10-19 14:40:52 +00:00
michael
20f92f5db7 * Merging revisions 43023 from trunk:
------------------------------------------------------------------------
    r43023 | michael | 2019-09-17 09:14:28 +0200 (Tue, 17 Sep 2019) | 1 line
    
    * Remove debug statement
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43239 -
2019-10-19 14:40:42 +00:00
michael
f484b61402 * Merging revisions 42974 from trunk:
------------------------------------------------------------------------
    r42974 | michael | 2019-09-11 09:40:44 +0200 (Wed, 11 Sep 2019) | 1 line
    
    * Fix bug ID #31385
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43238 -
2019-10-19 14:38:48 +00:00
michael
8ca580c2ad * Merging revisions 42972 from trunk:
------------------------------------------------------------------------
    r42972 | michael | 2019-09-10 10:44:41 +0200 (Tue, 10 Sep 2019) | 1 line
    
    * Make link dataset/connection/transaction thread safe (Bug ID 34274)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43237 -
2019-10-19 14:38:01 +00:00
michael
299e79e0f0 * Merging revisions 42965 from trunk:
------------------------------------------------------------------------
    r42965 | michael | 2019-09-09 09:17:39 +0200 (Mon, 09 Sep 2019) | 1 line
    
    * Make codepage property public in TFieldDef
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43236 -
2019-10-19 14:37:49 +00:00
michael
50275955bc * Merging revisions 42945 from trunk:
------------------------------------------------------------------------
    r42945 | michael | 2019-09-08 12:31:05 +0200 (Sun, 08 Sep 2019) | 1 line
    
    * Additional tests for sqlite3dataset by Luis Americo (bug ID 323247) 
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43235 -
2019-10-19 14:37:29 +00:00
michael
eb0fe9ac13 * Merging revisions 42892 from trunk:
------------------------------------------------------------------------
    r42892 | michael | 2019-09-01 19:42:38 +0200 (Sun, 01 Sep 2019) | 1 line
    
     Patch from Laco to allow switching to unicode version without change of end-user code
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43234 -
2019-10-19 14:35:45 +00:00
michael
53309395e1 * Merging revisions 42886 from trunk:
------------------------------------------------------------------------
    r42886 | michael | 2019-09-01 13:32:14 +0200 (Sun, 01 Sep 2019) | 1 line
    
    * Fix bug ID #35769
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43233 -
2019-10-19 14:35:27 +00:00
michael
89448abde1 * Merging revisions 42737 from trunk:
------------------------------------------------------------------------
    r42737 | lacak | 2019-08-19 13:52:28 +0200 (Mon, 19 Aug 2019) | 1 line
    
    fcl-db: sqldb: Upgrade TDS protocol version from 7.0 (MS SQL Server 2000) to newer 7.3 (MS SQL Server 2008) to support new data types DATE, TIME, DATETIME2 introduced in MS SQL Server 2008.
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43232 -
2019-10-19 14:34:55 +00:00
michael
a94e6c784e * Merging revisions 42672 from trunk:
------------------------------------------------------------------------
    r42672 | lacak | 2019-08-13 09:31:12 +0200 (Tue, 13 Aug 2019) | 1 line
    
    fcl-db: base: cosmetic (char-case)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43231 -
2019-10-19 14:34:36 +00:00
michael
4fede25682 * Merging revisions 42671 from trunk:
------------------------------------------------------------------------
    r42671 | lacak | 2019-08-13 09:28:26 +0200 (Tue, 13 Aug 2019) | 1 line
    
    fcl-db: tests: small improvement (change order of tests; first test native field type, after that string representation)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43230 -
2019-10-19 14:33:48 +00:00
michael
12117f7caf * Merging revisions 43211 from trunk:
------------------------------------------------------------------------
    r43211 | lacak | 2019-10-17 14:59:25 +0200 (Thu, 17 Oct 2019) | 1 line
    
    fcl-db: sdf: add virtual to ExtractDelimited(). Bug #36190
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43226 -
2019-10-19 12:04:04 +00:00
marco
c31f787eb2 --- Merging r43208 into '.':
U    packages/fcl-process/src/processbody.inc
--- Recording mergeinfo for merge of r43208 into '.':
 U   .

# revisions: 43208

git-svn-id: branches/fixes_3_2@43217 -
2019-10-17 19:30:59 +00:00
marco
65ae9d2413 * merge revs
git-svn-id: branches/fixes_3_2@43196 -
2019-10-14 13:58:40 +00:00
pierre
1e9677e20e ------------------------------------------------------------------------
r42061 | pierre | 2019-05-14 04:31:36 +0000 (Tue, 14 May 2019) | 1 line

 Add new files required to fix RTL compilation for macos target
------------------------------------------------------------------------
--- Merging r42061 into '.':
A    rtl/macos/classes.pp
A    rtl/macos/tthread.inc
--- Recording mergeinfo for merge of r42061 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43195 -
2019-10-14 11:43:37 +00:00
pierre
6eacae0a5a ------------------------------------------------------------------------
r42060 | pierre | 2019-05-14 04:29:24 +0000 (Tue, 14 May 2019) | 1 line

 Fix RTL compilation for macos target
------------------------------------------------------------------------
------------------------------------------------------------------------
r42060 | pierre | 2019-05-14 04:29:24 +0000 (Tue, 14 May 2019) | 1 line

 Fix RTL compilation for macos target
------------------------------------------------------------------------
--- Merging r42060 into '.':
U    rtl/macos/Makefile
C    rtl/macos/Makefile.fpc
U    rtl/macos/sysutils.pp
--- Recording mergeinfo for merge of r42060 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

git-svn-id: branches/fixes_3_2@43192 -
2019-10-13 16:48:38 +00:00
pierre
c689563167 ------------------------------------------------------------------------
r42555 | pierre | 2019-08-02 11:21:43 +0000 (Fri, 02 Aug 2019) | 1 line

 Add .NOTPARALLEL for beos and haiku RTLs
------------------------------------------------------------------------
--- Merging r42555 into '.':
U    rtl/beos/Makefile
U    rtl/beos/Makefile.fpc
U    rtl/haiku/Makefile
U    rtl/haiku/Makefile.fpc
--- Recording mergeinfo for merge of r42555 into '.':
 U   .
------------------------------------------------------------------------
r43042 | pierre | 2019-09-19 20:49:12 +0000 (Thu, 19 Sep 2019) | 3 lines

  + Add math unit dependency to types$(PPUEXT) rule.
  * Fix missing close-brace in several types$(PPUEXT) rules.

------------------------------------------------------------------------
--- Merging r43042 into '.':
U    rtl/<all target OS directories>/Makefile
U    rtl/<all target OS directories>/Makefile.fpc

git-svn-id: branches/fixes_3_2@43184 -
2019-10-13 10:07:21 +00:00
pierre
e05774c6c8 Fix list of targets for vcl-compat package
by also merging commits  #4294 and 42967
------------------------------------------------------------------------
r42941 | karoly | 2019-09-07 21:01:14 +0000 (Sat, 07 Sep 2019) | 1 line

vcl-compat: disabled it for palmos, atari, msdos and go32v2. fcl-web is not compiled for these, and that is a dependency.
------------------------------------------------------------------------
--- Merging r42941 into '.':
U    packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42941 into '.':
 U   .
------------------------------------------------------------------------
r42967 | pierre | 2019-09-09 08:27:53 +0000 (Mon, 09 Sep 2019) | 1 line

 Copy supported systems from fcl-web/fpmake.pp to avoid several build failures
------------------------------------------------------------------------
--- Merging r42967 into '.':
G    packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42967 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43180 -
2019-10-13 07:06:54 +00:00
marco
3e2807a08e --- Merging r43102 into '.':
U    packages/fcl-extra/src/daemonapp.pp
--- Recording mergeinfo for merge of r43102 into '.':
 U   .

# revisions: 43102

git-svn-id: branches/fixes_3_2@43174 -
2019-10-12 16:36:45 +00:00
marco
df577ea8a7 --- Merging r42937 into '.':
U    packages/fpmake_add.inc
U    packages/fpmake_proc.inc
A    packages/vcl-compat
A    packages/vcl-compat/Makefile
A    packages/vcl-compat/Makefile.fpc
A    packages/vcl-compat/fpmake.pp
A    packages/vcl-compat/src
A    packages/vcl-compat/src/System.NetEncoding.pp
A    packages/vcl-compat/tests
A    packages/vcl-compat/tests/tcnetencoding.pp
A    packages/vcl-compat/tests/testcompat.lpi
A    packages/vcl-compat/tests/testcompat.lpr
--- Recording mergeinfo for merge of r42937 into '.':
 U   .
--- Merging r42939 into '.':
U    packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42939 into '.':
 G   .
--- Merging r42975 into '.':
U    packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r42975 into '.':
 G   .
--- Merging r42976 into '.':
U    rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42976 into '.':
 G   .
--- Merging r43058 into '.':
U    utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r43058 into '.':
 G   .
--- Merging r43059 into '.':
U    packages/graph/src/ptcgraph/ptcmouse.pp
U    packages/ptc/docs/CHANGES.txt
U    packages/ptc/src/ptcwrapper/ptcwrapper.pp
--- Recording mergeinfo for merge of r43059 into '.':
 G   .
--- Merging r43085 into '.':
G    packages/vcl-compat/fpmake.pp
A    packages/vcl-compat/src/system.netencoding.pp
D    packages/vcl-compat/src/System.NetEncoding.pp
--- Recording mergeinfo for merge of r43085 into '.':
 G   .
--- Merging r43086 into '.':
G    packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r43086 into '.':
 G   .

# revisions: 42937,42939,42975,42976,43058,43059,43085,43086

git-svn-id: branches/fixes_3_2@43173 -
2019-10-12 16:15:55 +00:00
marco
5ab703bffd --- Merging r43026 into '.':
U    utils/instantfpc/instantfpc.pas
--- Recording mergeinfo for merge of r43026 into '.':
 U   .
--- Merging r43087 into '.':
U    packages/hash/src/hmac.pp
--- Recording mergeinfo for merge of r43087 into '.':
 G   .
--- Merging r43091 into '.':
U    packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43091 into '.':
 G   .
--- Merging r43095 into '.':
G    packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43095 into '.':
 G   .
--- Merging r43097 into '.':
U    rtl/unix/dl.pp
--- Recording mergeinfo for merge of r43097 into '.':
 G   .
--- Merging r43098 into '.':
G    packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43098 into '.':
 G   .
--- Merging r43117 into '.':
U    packages/chm/src/chmwriter.pas
--- Recording mergeinfo for merge of r43117 into '.':
 G   .

# revisions: 43026,43087,43091,43095,43097,43098,43117

git-svn-id: branches/fixes_3_2@43172 -
2019-10-12 15:24:05 +00:00
marco
8349a39d6e --- Merging r43137 into '.':
U    utils/ptopu.pp
--- Recording mergeinfo for merge of r43137 into '.':
 U   .
--- Merging r43141 into '.':
U    packages/chm/src/htmlutil.pas
--- Recording mergeinfo for merge of r43141 into '.':
 G   .
--- Merging r43142 into '.':
U    packages/libcurl/src/libcurl.pp
--- Recording mergeinfo for merge of r43142 into '.':
 G   .
--- Merging r43144 into '.':
U    packages/rtl-objpas/fpmake.pp
A    packages/rtl-objpas/src/inc/system.uitypes.pp
--- Recording mergeinfo for merge of r43144 into '.':
 G   .

# revisions: 43137,43141,43142,43144

git-svn-id: branches/fixes_3_2@43170 -
2019-10-12 11:59:37 +00:00
pierre
4ab14200d5 Merge of commits 42696, 42745, 42761 and 42762
------------------------------------------------------------------------
r42696 | svenbarth | 2019-08-15 11:41:36 +0000 (Thu, 15 Aug 2019) | 3 lines

* fix for Mantis #35964: reestablish pre r42594 behavior for WinCE as at least Windows Mobile does not support the required COM functions

Note: in theory Windows CE *can* support these functions, but it dependends on the provider whether they're indeed supported (e.g. Windows Mobile does not). Probably this should be revisited once we support the "delayed" directive.
------------------------------------------------------------------------
--- Merging r42696 into '.':
U    packages/winunits-base/src/comobj.pp
--- Recording mergeinfo for merge of r42696 into '.':
 U   .
------------------------------------------------------------------------
r42745 | pierre | 2019-08-20 12:11:17 +0000 (Tue, 20 Aug 2019) | 1 line

 Add x86_64-aros and m68k-macos to OSCPUSupported table
------------------------------------------------------------------------
--- Merging r42745 into '.':
C    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r42745 into '.':
 G   .
Summary of conflicts:
  Text conflicts: 1
------------------------------------------------------------------------
r42761 | pierre | 2019-08-22 13:01:08 +0000 (Thu, 22 Aug 2019) | 1 line

 Also use ACPU and AOS parameters to call GetUnitConfigOutputFilename
------------------------------------------------------------------------
--- Merging r42761 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r42761 into '.':
 G   .
------------------------------------------------------------------------
r42762 | pierre | 2019-08-22 15:33:45 +0000 (Thu, 22 Aug 2019) | 6 lines

  * Fix errors in sourcezip generation:
    in fcl-process, by adding src subdirectory also as include dir.
    in winceunits, by removing activex from implicit unit list for wince target,
    as it already is in the explicit unit list.

------------------------------------------------------------------------
--- Merging r42762 into '.':
U    packages/fcl-process/fpmake.pp
U    packages/winceunits/fpmake.pp
--- Recording mergeinfo for merge of r42762 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43036 -
2019-09-19 07:42:56 +00:00
marco
bb863aa53d --- Merging r42994 into '.':
U    rtl/win/wininc/defines.inc
U    rtl/win/wininc/func.inc
U    rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42994 into '.':
 U   .
--- Merging r42995 into '.':
G    rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42995 into '.':
 G   .
--- Merging r42996 into '.':
G    rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42996 into '.':
 G   .

# revisions: 42994,42995,42996

git-svn-id: branches/fixes_3_2@43030 -
2019-09-18 08:22:49 +00:00
Jonas Maebe
b489002e4e --- Merging r42835 into '.':
U    compiler/powerpc64/cpupara.pas
--- Recording mergeinfo for merge of r42835 into '.':
 U   .

git-svn-id: branches/fixes_3_2@42930 -
2019-09-07 12:23:20 +00:00
marco
c07b8a1954 --- Merging r42594 into '.':
U    packages/winunits-base/src/comobj.pp
U    packages/winunits-base/src/comserv.pp
--- Recording mergeinfo for merge of r42594 into '.':
 U   .
--- Merging r42908 into '.':
U    packages/fcl-stl/doc/hashmapexample.pp
U    packages/fcl-stl/src/ghashmap.pp
--- Recording mergeinfo for merge of r42908 into '.':
 G   .
--- Merging r42909 into '.':
G    packages/fcl-stl/src/ghashmap.pp
U    packages/fcl-stl/src/gvector.pp
--- Recording mergeinfo for merge of r42909 into '.':
 G   .
--- Merging r42910 into '.':
U    packages/fcl-stl/doc/mapexample.pp
U    packages/fcl-stl/src/gmap.pp
--- Recording mergeinfo for merge of r42910 into '.':
 G   .
--- Merging r42914 into '.':
U    packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r42914 into '.':
 G   .
--- Merging r42915 into '.':
U    packages/fcl-stl/src/ghashset.pp
U    packages/fcl-stl/src/gset.pp
--- Recording mergeinfo for merge of r42915 into '.':
 G   .

# revisions: 42594,42908,42909,42910,42914,42915

git-svn-id: branches/fixes_3_2@42922 -
2019-09-05 12:17:22 +00:00
marco
415c951a87 --- Merging r42331 into '.':
U    packages/fcl-db/src/base/dbconst.pas
--- Recording mergeinfo for merge of r42331 into '.':
 U   .
--- Merging r42467 into '.':
U    packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r42467 into '.':
 G   .
--- Merging r42497 into '.':
U    packages/fcl-db/tests/testfieldtypes.pas
--- Recording mergeinfo for merge of r42497 into '.':
 G   .

# revisions: 42331,42467,42497

git-svn-id: branches/fixes_3_2@42913 -
2019-09-03 14:52:53 +00:00
marco
c054c303ba --- Merging r42812 into '.':
A    packages/winunits-base/tests/inproccomtest
A    packages/winunits-base/tests/inproccomtest/com_clnt.dpr
A    packages/winunits-base/tests/inproccomtest/com_impl.pas
A    packages/winunits-base/tests/inproccomtest/com_serv.dpr
A    packages/winunits-base/tests/inproccomtest/com_serv.tlb
A    packages/winunits-base/tests/inproccomtest/com_serv_TLB.pas
--- Recording mergeinfo for merge of r42812 into '.':
 U   .
--- Merging r42813 into '.':
U    rtl/objpas/classes/classesh.inc
--- Recording mergeinfo for merge of r42813 into '.':
 G   .
--- Merging r42586 into '.':
U    packages/fcl-image/src/fptiffcmn.pas
U    packages/fcl-image/src/fpwritetiff.pas
--- Recording mergeinfo for merge of r42586 into '.':
 G   .
--- Merging r42876 into '.':
U    packages/fcl-image/src/fpreadpng.pp
--- Recording mergeinfo for merge of r42876 into '.':
 G   .

# revisions: 42812,42813,42586,42876

git-svn-id: branches/fixes_3_2@42912 -
2019-09-03 14:27:17 +00:00
marco
65e16f4f98 --- Merging r41636 into '.':
U    rtl/win/sysosh.inc
--- Recording mergeinfo for merge of r41636 into '.':
 U   .
--- Merging r41795 into '.':
U    rtl/objpas/classes/classesh.inc
U    rtl/objpas/classes/collect.inc
--- Recording mergeinfo for merge of r41795 into '.':
 G   .
--- Merging r41881 into '.':
U    rtl/objpas/sysutils/syshelph.inc
--- Recording mergeinfo for merge of r41881 into '.':
 G   .
--- Merging r42149 into '.':
U    rtl/msdos/dos.pp
--- Recording mergeinfo for merge of r42149 into '.':
 G   .
--- Merging r42180 into '.':
U    rtl/freebsd/sysnr.inc
--- Recording mergeinfo for merge of r42180 into '.':
 G   .
--- Merging r42452 into '.':
U    rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r42452 into '.':
 G   .
--- Merging r42775 into '.':
U    packages/winunits-base/src/mmsystem.pp
--- Recording mergeinfo for merge of r42775 into '.':
 G   .

# revisions: 41636,41795,41881,42149,42180,42452,42775

git-svn-id: branches/fixes_3_2@42911 -
2019-09-03 13:30:49 +00:00
Jonas Maebe
f29598384b * Objective-Pascal inferred result type and improved category method searching
--- Merging r42815 through r42817 into '.':
U    tests/test/tobjc34.pp
U    tests/test/tobjc36.pp
U    tests/test/tobjcl2.pp
A    tests/test/units/cocoaall
A    tests/test/units/cocoaall/tw35994.pp
U    compiler/defcmp.pas
U    compiler/ncal.pas
C    compiler/pdecl.pas
C    compiler/symconst.pas
C    compiler/utils/ppuutils/ppudump.pp
U    compiler/symtable.pas
--- Recording mergeinfo for merge of r42815 through r42817 into '.':
 U   .
--- Merging r42857 into '.':
G    compiler/symtable.pas
--- Recording mergeinfo for merge of r42857 into '.':
 G   .
  

git-svn-id: branches/fixes_3_2@42883 -
2019-08-31 11:43:41 +00:00
pierre
43436808e9 --- Merging r42860 into '.':
U    compiler/arm/narmmat.pas
--- Recording mergeinfo for merge of r42860 into '.':
 U   .
------------------------------------------------------------------------
r42860 | pierre | 2019-08-28 07:38:35 +0000 (Wed, 28 Aug 2019) | 1 line

 Fix code generated in tarmnotnode.second_boolean
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42879 -
2019-08-30 13:05:02 +00:00
michael
810989c765 * Merging revisions r42871,r42872 from trunk:
------------------------------------------------------------------------
    r42871 | michael | 2019-08-29 21:02:08 +0200 (Thu, 29 Aug 2019) | 1 line
    
    * Fix forgotten loadmimetypes
    ------------------------------------------------------------------------
    r42872 | michael | 2019-08-29 21:07:52 +0200 (Thu, 29 Aug 2019) | 1 line
    
    * Observe -m
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42873 -
2019-08-29 19:08:45 +00:00
michael
7e962b39e2 * Merging revisions 42867 from trunk:
------------------------------------------------------------------------
    r42867 | michael | 2019-08-29 08:44:01 +0200 (Thu, 29 Aug 2019) | 1 line
    
    Fix bug ID #36023, deprecate sslleay
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42868 -
2019-08-29 06:45:00 +00:00
michael
f6681cb340 * Merging revisions 42864 from trunk:
------------------------------------------------------------------------
    r42864 | michael | 2019-08-28 21:28:30 +0200 (Wed, 28 Aug 2019) | 1 line
    
    * Bring OpenSSL up to date with V1.1
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42865 -
2019-08-28 19:30:24 +00:00
pierre
8875b9a109 --- Merging r42858 into '.':
U    packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r42858 into '.':
 U   .
------------------------------------------------------------------------
r42858 | pierre | 2019-08-27 13:51:22 +0000 (Tue, 27 Aug 2019) | 1 line

 Explicitly add fpc-registry dependency for AllWindowsOSes (because fpmimetypes unit uses registry unit)
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42861 -
2019-08-28 09:47:37 +00:00
michael
15a627acea * Merging revisions r42795 from trunk:
------------------------------------------------------------------------
    r42795 | michael | 2019-08-24 11:56:58 +0200 (Sat, 24 Aug 2019) | 1 line
    
    * Small cosmetic improvement to output
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42856 -
2019-08-27 07:08:18 +00:00
michael
4e5b29cb58 * Merging revisions r42794 from trunk:
------------------------------------------------------------------------
    r42794 | michael | 2019-08-24 11:56:27 +0200 (Sat, 24 Aug 2019) | 1 line
    
    * Add module to units part of project
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42855 -
2019-08-27 07:08:07 +00:00
michael
36e578292b * Merging revisions 42351 from trunk:
------------------------------------------------------------------------
    r42351 | michael | 2019-07-11 22:33:39 +0200 (Thu, 11 Jul 2019) | 1 line
    
    * Fix bug ID #0035817
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42854 -
2019-08-27 07:07:14 +00:00
michael
2627964fec * Merging revisions 42350 from trunk:
------------------------------------------------------------------------
    r42350 | michael | 2019-07-11 22:17:29 +0200 (Thu, 11 Jul 2019) | 1 line
    
    * Always try to show the field name when possible
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42853 -
2019-08-27 07:07:01 +00:00
michael
85bf1fdb9e * Merging revisions 42349 from trunk:
------------------------------------------------------------------------
    r42349 | michael | 2019-07-11 22:16:35 +0200 (Thu, 11 Jul 2019) | 1 line
    
    * Always try to show the field name when possible
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42852 -
2019-08-27 07:06:46 +00:00
michael
fb0ce8bc32 * Merging revisions 42344 from trunk:
------------------------------------------------------------------------
    r42344 | michael | 2019-07-08 12:27:11 +0200 (Mon, 08 Jul 2019) | 1 line
    
    * Fix bug ID #35796, codepage issue when getting string as variant
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42851 -
2019-08-27 07:06:28 +00:00
michael
590c23c6bb * Merging revisions 42831,42832 from trunk:
------------------------------------------------------------------------
    r42831 | michael | 2019-08-26 20:32:59 +0200 (Mon, 26 Aug 2019) | 1 line
    
    * Fix bug ID #35887
    ------------------------------------------------------------------------
    r42832 | michael | 2019-08-26 20:50:03 +0200 (Mon, 26 Aug 2019) | 1 line
    
    * Add support for citext field
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42850 -
2019-08-27 07:03:44 +00:00
michael
6ef897798e * Merging revisions 42820,42821,42822,42823,42825 from trunk:
------------------------------------------------------------------------
    r42820 | michael | 2019-08-26 08:36:01 +0200 (Mon, 26 Aug 2019) | 1 line
    
    * Add LoadKnownTypes to load default set from OS (including registry on windows)
    ------------------------------------------------------------------------
    r42821 | michael | 2019-08-26 08:44:10 +0200 (Mon, 26 Aug 2019) | 1 line
    
    * Add mime.types for benefit of windows users, call new LoadKnownTypes
    ------------------------------------------------------------------------
    r42822 | michael | 2019-08-26 08:52:21 +0200 (Mon, 26 Aug 2019) | 1 line
    
    * Some additional help
    ------------------------------------------------------------------------
    r42823 | michael | 2019-08-26 08:53:12 +0200 (Mon, 26 Aug 2019) | 1 line
    
    * Remove units no longer needed
    ------------------------------------------------------------------------
    r42825 | michael | 2019-08-26 10:30:06 +0200 (Mon, 26 Aug 2019) | 1 line
    
    * Moved fpmimetypes unit to fcl-web
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42849 -
2019-08-27 07:03:08 +00:00