fpc/rtl/android
marco c02fa41b46 --- Merging r32328 into '.':
U    rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32328 into '.':
 U   .
--- Merging r32345 into '.':
G    rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32345 into '.':
 G   .
--- Merging r32538 into '.':
G    rtl/android/cwstring.pp
--- Recording mergeinfo for merge of r32538 into '.':
 G   .

# revisions: 32328,32345,32538

git-svn-id: branches/fixes_3_0@33921 -
2016-06-05 19:50:07 +00:00
..
arm Merged revision(s) 31682, 31703-31704, 31719, 31761-31762, 32008, 32021-32024, 32033, 32035 from trunk (Android PIC support): 2016-04-07 14:03:44 +00:00
i386 Merged revision(s) 31682, 31703-31704, 31719, 31761-31762, 32008, 32021-32024, 32033, 32035 from trunk (Android PIC support): 2016-04-07 14:03:44 +00:00
jvm * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
mipsel Merged revision(s) 31682, 31703-31704, 31719, 31761-31762, 32008, 32021-32024, 32033, 32035 from trunk (Android PIC support): 2016-04-07 14:03:44 +00:00
cwstring.pp --- Merging r32328 into '.': 2016-06-05 19:50:07 +00:00
dlandroid.inc --- Merging r29422 through r29424 into '.': 2015-06-17 19:26:25 +00:00
Makefile Merged revision(s) 31682, 31703-31704, 31719, 31761-31762, 32008, 32021-32024, 32033, 32035 from trunk (Android PIC support): 2016-04-07 14:03:44 +00:00
Makefile.fpc Merged revision(s) 31682, 31703-31704, 31719, 31761-31762, 32008, 32021-32024, 32033, 32035 from trunk (Android PIC support): 2016-04-07 14:03:44 +00:00
sysandroid.inc Merged revision(s) 31682, 31703-31704, 31719, 31761-31762, 32008, 32021-32024, 32033, 32035 from trunk (Android PIC support): 2016-04-07 14:03:44 +00:00