marco a76f55641c --- Merging r49563 into '.': ... U packages/rtl-objpas/src/inc/system.uitypes.pp --- Recording mergeinfo for merge of r49563 into '.': U . --- Merging r49566 into '.': G packages/rtl-objpas/src/inc/system.uitypes.pp --- Recording mergeinfo for merge of r49566 into '.': G . # revisions: 49563,49566 fetching log for rev 49563 - 369 characters r49563 | marco | 2021-06-26 18:00:12 +0200 (Sat, 26 Jun 2021) | 2 lines Changed paths: M /trunk/packages/rtl-objpas/src/inc/system.uitypes.pp * tcolors alias. * a few missing colors copied from lazarus' graphics unit fetching log for rev 49566 - 305 characters r49566 | marco | 2021-06-26 21:24:57 +0200 (Sat, 26 Jun 2021) | 2 lines Changed paths: M /trunk/packages/rtl-objpas/src/inc/system.uitypes.pp * fix typo git-svn-id: branches/fixes_3_2@49600 -		2021-07-11 18:30:43 +00:00
..
src	--- Merging r49563 into '.':	2021-07-11 18:30:43 +00:00
tests	# revisions: 43009,43591,43772,43777,43778,43779,43780,43791,43792	2020-01-14 10:51:13 +00:00
fpmake.pp	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
Makefile	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
Makefile.fpc	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
Makefile.fpc.fpcmake	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00