marco 74aff88586 --- Merging r49045 into '.': ... C Makefile C Makefile.fpc --- Recording mergeinfo for merge of r49045 into '.': U . Summary of conflicts: Text conflicts: 2 # revisions: 49045 r49045 | jonas | 2021-03-24 15:33:09 +0100 (Wed, 24 Mar 2021) | 1 line Changed paths: M /trunk/Makefile M /trunk/Makefile.fpc * support building with FPC 3.2.2 git-svn-id: branches/fixes_3_2@49384 -		2021-05-20 20:03:52 +00:00
..
data
cldrhelper.pas	* Fix bug #31947: upgrade natve unicode implementation to version 9 and CLDR 30 (Patch from Inoussa)	2017-06-03 16:10:39 +00:00
cldrparser.lpi
cldrparser.lpr	* Fix bug #31947: upgrade natve unicode implementation to version 9 and CLDR 30 (Patch from Inoussa)	2017-06-03 16:10:39 +00:00
cldrtest.pas	* Fix bug #31947: upgrade natve unicode implementation to version 9 and CLDR 30 (Patch from Inoussa)	2017-06-03 16:10:39 +00:00
cldrtxt.pas	* Fix bug #31947: upgrade natve unicode implementation to version 9 and CLDR 30 (Patch from Inoussa)	2017-06-03 16:10:39 +00:00
cldrxml.pas	* Fix bug #31947: upgrade natve unicode implementation to version 9 and CLDR 30 (Patch from Inoussa)	2017-06-03 16:10:39 +00:00
fpmake.pp	--- Merging r49045 into '.':	2021-05-20 20:03:52 +00:00
grbtree.pas	* fix the Upgrade to Unicode version 7 and CLDR 27 from r32814	2016-05-19 15:44:22 +00:00
helper.pas	* Fix bug #31947: upgrade natve unicode implementation to version 9 and CLDR 30 (Patch from Inoussa)	2017-06-03 16:10:39 +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
parse-collations.bat
parse-collations.sh
trie.pas
uca_test.pas
unicodeset.pas	* fix the Upgrade to Unicode version 7 and CLDR 27 from r32814	2016-05-19 15:44:22 +00:00
unihelper.lpi
unihelper.lpr	* Fix bug #31947: upgrade natve unicode implementation to version 9 and CLDR 30 (Patch from Inoussa)	2017-06-03 16:10:39 +00:00
weight_derivation.inc