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
..
examples	Update all Makefile's to enable x86_64-haiku target	2019-05-28 22:07:11 +00:00
src	--- Merging r43137 into '.':	2019-10-12 11:59:37 +00:00
fpmake.pp	more version updates	2018-08-18 15:26:38 +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