U packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42088 into '.':
U .
--- Merging r42708 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42708 into '.':
G .
--- Merging r42709 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42709 into '.':
G .
--- Merging r42710 into '.':
U packages/rtl-objpas/tests/tests.rtti.impl.pas
--- Recording mergeinfo for merge of r42710 into '.':
G .
--- Merging r42720 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42720 into '.':
G .
--- Merging r42731 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42731 into '.':
G .
--- Merging r42732 into '.':
U packages/rtl-objpas/tests/tests.rtti.pas
--- Recording mergeinfo for merge of r42732 into '.':
G .
--- Recording mergeinfo for merge of r42732 into 'packages/rtl-objpas/tests/tests.rtti.pas':
U packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42733 into '.':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Recording mergeinfo for merge of r42733 into '.':
G .
--- Recording mergeinfo for merge of r42733 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42734 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42734 into '.':
G .
--- Recording mergeinfo for merge of r42734 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42738 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42738 into '.':
G .
--- Recording mergeinfo for merge of r42738 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42740 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42740 into '.':
G .
--- Recording mergeinfo for merge of r42740 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42755 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42755 into '.':
G .
--- Recording mergeinfo for merge of r42755 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42756 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42756 into '.':
G .
--- Recording mergeinfo for merge of r42756 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42757 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42757 into '.':
G .
--- Recording mergeinfo for merge of r42757 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42758 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42758 into '.':
G .
--- Recording mergeinfo for merge of r42758 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42780 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42780 into '.':
G .
--- Recording mergeinfo for merge of r42780 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42801 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42801 into '.':
G .
--- Recording mergeinfo for merge of r42801 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42802 into '.':
U rtl/objpas/typinfo.pp
--- Recording mergeinfo for merge of r42802 into '.':
G .
--- Recording mergeinfo for merge of r42802 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42803 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42803 into '.':
G .
--- Recording mergeinfo for merge of r42803 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42804 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42804 into '.':
G .
--- Recording mergeinfo for merge of r42804 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42805 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42805 into '.':
G .
--- Recording mergeinfo for merge of r42805 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42806 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42806 into '.':
G .
--- Recording mergeinfo for merge of r42806 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
# revisions: 42088,42708,42709,42710,42720,42731,42732,42733,42734,42738,42740,42755,42756,42757,42758,42780,42801,42802,42803,42804,42805,42806
git-svn-id: branches/fixes_3_2@43423 -
f6d44edc07