marco dc6d580270 --- Merging r42261 into '.': ... U packages/morphunits/src/agraphics.pas U packages/os4units/src/agraphics.pas --- Recording mergeinfo for merge of r42261 into '.': U . # revisions: 42261 git-svn-id: branches/fixes_3_2@42345 -		2019-07-08 13:45:57 +00:00
..
src	--- Merging r42261 into '.':	2019-07-08 13:45:57 +00:00
fpmake.pp	--- Merging r40496 into '.':	2019-02-09 11:38:56 +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