--- Merging r30258 into '.':

U    packages/chm/src/fasthtmlparser.pas
--- Recording mergeinfo for merge of r30258 into '.':
 U   .
--- Merging r30292 into '.':
U    rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r30292 into '.':
 G   .
--- Merging r30327 into '.':
U    packages/winunits-base/src/imm_dyn.pas
U    packages/winunits-base/src/imm.pas
--- Recording mergeinfo for merge of r30327 into '.':
 G   .
--- Merging r30618 into '.':
U    utils/fpmake.pp
--- Recording mergeinfo for merge of r30618 into '.':
 G   .
--- Merging r30621 into '.':
U    rtl/linux/linux.pp
--- Recording mergeinfo for merge of r30621 into '.':
 G   .
--- Merging r30332 into '.':
U    rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r30332 into '.':
 G   .
--- Merging r30333 into '.':
G    rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r30333 into '.':
 G   .
--- Merging r30365 into '.':
U    packages/regexpr/src/regexpr.pas
--- Recording mergeinfo for merge of r30365 into '.':
 G   .

# revisions: 30258,30292,30327,30618,30621,30332,30333,30365


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31113 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 1 insertions, 0 deletions

diff --git a/utils/fpmake.pp b/utils/fpmake.pp
index 074b529bfa..59c615d5a7 100644
--- a/utils/fpmake.pp
+++ b/utils/fpmake.pp
@@ -66,6 +66,7 @@ begin
     P.Dependencies.Add('hash');
     P.Dependencies.Add('univint',[darwin,iphonesim]);
     P.Dependencies.Add('rtl-extra');
+    P.Dependencies.Add('rtl-objpas');
 	
     P.Version:='3.0.1';