Browse Source
--- Merging r18081 into 'rtl/inc/objc1.inc':
C rtl/inc/objc1.inc
--- Merging r18081 into 'tests/test/ttpara1.pp':
C tests/test/ttpara1.pp
--- Merging r18081 into 'tests/test/ttpara2.pp':
C tests/test/ttpara2.pp
--- Merging r18081 into 'tests/test/cg/ttincdec.pp':
C tests/test/cg/ttincdec.pp
--- Merging r18081 into 'tests/webtbf/tw13815.pp':
C tests/webtbf/tw13815.pp
--- Merging r18081 into 'tests/tbf/tb0216.pp':
C tests/tbf/tb0216.pp
--- Merging r18081 into 'packages/fcl-xml/tests/README_DOM.txt':
C packages/fcl-xml/tests/README_DOM.txt
--- Merging r18081 into 'packages/unzip/src/unzip51g.pp':
C packages/unzip/src/unzip51g.pp
--- Merging r18081 into 'packages/winunits-base/src/dwmapi.pp':
C packages/winunits-base/src/dwmapi.pp
Summary of conflicts:
Property conflicts: 9
# revisions: 18081
------------------------------------------------------------------------
r18081 | marco | 2011-08-03 22:33:49 +0200 (Wed, 03 Aug 2011) | 2 lines
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
* Another attempt to kill stale mergeinfo
------------------------------------------------------------------------
git-svn-id: branches/fixes_2_6@18083 -