fpc/packages/univint
Jonas Maebe eeb8c747d5 --- Merging r42499 into '.':
U    packages/univint/fpmake.pp
...
--- Recording mergeinfo for merge of r42499 into '.':
 U   .
--- Merging r42500 into '.':
U    packages/cocoaint/fpmake.pp
...
--- Recording mergeinfo for merge of r42500 into '.':
 G   .
--- Merging r42548 into '.':
G    packages/univint/src/AUComponent.pas
G    packages/univint/src/AudioUnitProperties.pas
--- Recording mergeinfo for merge of r42548 into '.':
 G   .
--- Merging r43684 into '.':
U    compiler/msg/errore.msg
...
--- Recording mergeinfo for merge of r43684 into '.':
 G   .
--- Merging r43687 into '.':
G    packages/univint/src/AudioComponents.pas
U    packages/univint/src/AudioServices.pas
--- Recording mergeinfo for merge of r43687 into '.':
 G   .

git-svn-id: branches/fixes_3_2@44035 -
2020-01-26 12:48:42 +00:00
..
examples Update all Makefile's to enable x86_64-haiku target 2019-05-28 22:07:11 +00:00
src --- Merging r42499 into '.': 2020-01-26 12:48:42 +00:00
fpmake.pp --- Merging r42499 into '.': 2020-01-26 12:48:42 +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