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
..
examples	Update all Makefile's to enable x86_64-haiku target	2019-05-28 22:07:11 +00:00
src	--- Merging r43026 into '.':	2019-10-12 15:24:05 +00:00
tests
fpmake.pp	Marge of more trunk fixes into fixes branch.	2018-12-23 22:27:05 +00:00
Makefile	Update all Makefile's to enable x86_64-haiku target	2019-05-28 22:07:11 +00:00
Makefile.fpc	* version to 3.2.0-beta	2018-08-18 15:25:41 +00:00
Makefile.fpc.fpcmake	* version to 3.2.0-beta	2018-08-18 15:25:41 +00:00