--- Merging r18079 into 'rtl/inc/objc1.inc':
G rtl/inc/objc1.inc
--- Merging r18079 into 'tests/test/ttpara1.pp':
G tests/test/ttpara1.pp
--- Merging r18079 into 'tests/test/ttpara2.pp':
G tests/test/ttpara2.pp
--- Merging r18079 into 'tests/test/cg/ttincdec.pp':
G tests/test/cg/ttincdec.pp
--- Merging r18079 into 'tests/webtbf/tw13815.pp':
G tests/webtbf/tw13815.pp
--- Merging r18079 into 'tests/tbf/tb0216.pp':
G tests/tbf/tb0216.pp
--- Merging r18079 into 'packages/fcl-xml/tests/README_DOM.txt':
G packages/fcl-xml/tests/README_DOM.txt
--- Merging r18079 into 'packages/unzip/src/unzip51g.pp':
G packages/unzip/src/unzip51g.pp
--- Merging r18079 into 'packages/winunits-base/src/dwmapi.pp':
G packages/winunits-base/src/dwmapi.pp

# revisions: 18079
------------------------------------------------------------------------
r18079 | marco | 2011-08-03 22:24:03 +0200 (Wed, 03 Aug 2011) | 1 line
Changed paths:
M /trunk/packages/fcl-xml/tests/README_DOM.txt
M /trunk/packages/unzip/src/unzip51g.pp
M /trunk/packages/winunits-base/src/dwmapi.pp
M /trunk/rtl/inc/objc1.inc
M /trunk/tests/tbf/tb0216.pp
M /trunk/tests/test/cg/ttincdec.pp
M /trunk/tests/test/ttpara1.pp
M /trunk/tests/test/ttpara2.pp
M /trunk/tests/webtbf/tw13815.pp

* fixed some files with svn:mergeinfo
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@18082 -