fpc/packages
marco 3ed480c0c9 --- Merging r49071 into '.':
U    packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r49071 into '.':
 U   .
--- Merging r49125 into '.':
G    packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r49125 into '.':
 G   .

# revisions: 49071,49125
r49071 | marco | 2021-03-28 14:48:20 +0200 (Sun, 28 Mar 2021) | 1 line
Changed paths:
   M /trunk/packages/chm/src/chmfilewriter.pas

 * more fixes from serbod repo. Make paths relative.
r49125 | marco | 2021-04-05 21:29:19 +0200 (Mon, 05 Apr 2021) | 1 line
Changed paths:
   M /trunk/packages/chm/src/chmfilewriter.pas

 * attempt to fix mantis #28321.   Use path of project file as base of chm.

git-svn-id: branches/fixes_3_2@49127 -
2021-04-06 13:58:38 +00:00
..
a52 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
ami-extra Merge commit 48814: 2021-03-23 23:59:37 +00:00
amunits Merge commit 48814: 2021-03-23 23:59:37 +00:00
arosunits Merge commit 48814: 2021-03-23 23:59:37 +00:00
aspell Merge commit 48814: 2021-03-23 23:59:37 +00:00
bfd Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
bzip2 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
cairo Merge commit 48814: 2021-03-23 23:59:37 +00:00
cdrom Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
chm --- Merging r49071 into '.': 2021-04-06 13:58:38 +00:00
cocoaint Merge commit 48814: 2021-03-23 23:59:37 +00:00
dblib Merge commit 48814: 2021-03-23 23:59:37 +00:00
dbus --- Merging r47124 into '.': 2020-10-18 14:14:15 +00:00
dts Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fastcgi Merge commit 48814: 2021-03-23 23:59:37 +00:00
fcl-async Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fcl-base --- Merging r48282 into '.': 2021-04-03 09:14:56 +00:00
fcl-db * Merging revisions r48898,r48899,r48900,r48901 from trunk: 2021-03-10 12:50:19 +00:00
fcl-extra Merge commit 48814: 2021-03-23 23:59:37 +00:00
fcl-fpcunit Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fcl-image Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fcl-js Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fcl-json * Merging revisions r48926,r48931 from trunk: 2021-03-10 12:49:27 +00:00
fcl-net # revisions: 45877,46843,46844,46845,47275,47364,47505 2020-11-25 07:48:56 +00:00
fcl-passrc --- Merging r47124 into '.': 2020-10-18 14:14:15 +00:00
fcl-pdf * Merging revisions 48694,48696,48697 from trunk: 2021-02-17 16:35:56 +00:00
fcl-process --- Merging r48876 into '.': 2021-03-23 13:06:59 +00:00
fcl-registry Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fcl-report Merge commit 48814: 2021-03-23 23:59:37 +00:00
fcl-res --- Merging r47820 into '.': 2020-12-30 13:49:27 +00:00
fcl-sdo Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fcl-sound --- Merging r47447 into '.': 2020-11-30 17:55:29 +00:00
fcl-stl --- Merging r48876 into '.': 2021-03-23 13:06:59 +00:00
fcl-web * Merging revisions r48898,r48899,r48900,r48901 from trunk: 2021-03-10 12:50:19 +00:00
fcl-xml # revisions: 46531,46744,46747,47288,47327,47366,47392,47393,47414 2020-12-08 20:32:00 +00:00
fftw Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fpgtk Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fpindexer Merge commit 48814: 2021-03-23 23:59:37 +00:00
fpmkunit Merge commit 48814: 2021-03-23 23:59:37 +00:00
fppkg Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fuse Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
fv --- Merging r48428 into '.': 2021-02-04 16:13:51 +00:00
gdbint Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
gdbm Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
ggi Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
gmp Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
gnome1 Merge commit 48814: 2021-03-23 23:59:37 +00:00
gnutls Merge commit 48814: 2021-03-23 23:59:37 +00:00
googleapi Merge commit 48814: 2021-03-23 23:59:37 +00:00
graph --- Merging r47236 into '.': 2020-11-30 18:14:22 +00:00
gtk1 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
gtk2 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
hash Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
hermes Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
httpd13 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
httpd20 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
httpd22 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
httpd24 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
ibase Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
iconvenc Merge commit 48814: 2021-03-23 23:59:37 +00:00
ide --- Merging r47446 into '.': 2020-11-30 17:33:17 +00:00
imagemagick Merge commit 48814: 2021-03-23 23:59:37 +00:00
imlib Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
iosxlocale Merge commit 48814: 2021-03-23 23:59:37 +00:00
jni Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
ldap Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
libc Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
libcups Merge commit 48814: 2021-03-23 23:59:37 +00:00
libcurl Merge commit 48814: 2021-03-23 23:59:37 +00:00
libenet Merge commit 48814: 2021-03-23 23:59:37 +00:00
libffi Merge commit 48814: 2021-03-23 23:59:37 +00:00
libfontconfig Merge commit 48814: 2021-03-23 23:59:37 +00:00
libgbafpc Merge commit 48814: 2021-03-23 23:59:37 +00:00
libgc Merge commit 48814: 2021-03-23 23:59:37 +00:00
libgd # revisions: 44952,44996,45855,46343,46753,46839 2020-11-25 07:26:17 +00:00
libmagic Merge commit 48814: 2021-03-23 23:59:37 +00:00
libmicrohttpd Merge commit 48814: 2021-03-23 23:59:37 +00:00
libndsfpc Merge commit 48814: 2021-03-23 23:59:37 +00:00
libogcfpc Merge commit 48814: 2021-03-23 23:59:37 +00:00
libpng Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
librsvg Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
libsee Merge commit 48814: 2021-03-23 23:59:37 +00:00
libtar Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
libusb Merge commit 48814: 2021-03-23 23:59:37 +00:00
libvlc Merge commit 48814: 2021-03-23 23:59:37 +00:00
libxml Merge commit 48814: 2021-03-23 23:59:37 +00:00
lua Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
mad Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
matroska Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
modplug Merge commit 48814: 2021-03-23 23:59:37 +00:00
morphunits Merge commit 48814: 2021-03-23 23:59:37 +00:00
mysql * Merging revisions 48692 from trunk: 2021-02-17 13:04:58 +00:00
ncurses Merge commit 48814: 2021-03-23 23:59:37 +00:00
newt Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
numlib Merge commit 48814: 2021-03-23 23:59:37 +00:00
nvapi Merge commit 48814: 2021-03-23 23:59:37 +00:00
objcrtl Merge commit 48814: 2021-03-23 23:59:37 +00:00
odata Merge commit 48814: 2021-03-23 23:59:37 +00:00
odbc Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
oggvorbis Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
openal Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
opencl Merge commit 48814: 2021-03-23 23:59:37 +00:00
opengl Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
opengles Merge commit 48814: 2021-03-23 23:59:37 +00:00
openssl # revisions: 46759 2020-11-25 08:04:43 +00:00
oracle Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
os2units Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
os4units Merge commit 48814: 2021-03-23 23:59:37 +00:00
palmunits Merge commit 48814: 2021-03-23 23:59:37 +00:00
pasjpeg --- Merging r48428 into '.': 2021-02-04 16:13:51 +00:00
pastojs Merge commit 48814: 2021-03-23 23:59:37 +00:00
paszlib # revisions: 47618 2020-12-08 20:34:09 +00:00
pcap Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
postgres Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
proj4 Merge commit 48814: 2021-03-23 23:59:37 +00:00
ptc --- Merging r47236 into '.': 2020-11-30 18:14:22 +00:00
pthreads Merge commit 48814: 2021-03-23 23:59:37 +00:00
pxlib Merge commit 48814: 2021-03-23 23:59:37 +00:00
regexpr --- Merging r49040 into '.': 2021-04-03 09:12:47 +00:00
rexx Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
rtl-console Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
rtl-extra * Merging revisions r48864 from trunk: 2021-03-10 12:51:05 +00:00
rtl-generics # revisions: 45877,46843,46844,46845,47275,47364,47505 2020-11-25 07:48:56 +00:00
rtl-objpas --- Merging r49040 into '.': 2021-04-03 09:12:47 +00:00
rtl-unicode Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
sdl Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
sndfile Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
sqlite Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
svgalib Merge commit 48814: 2021-03-23 23:59:37 +00:00
symbolic --- Merging r48525 into '.': 2021-02-17 09:36:43 +00:00
syslog Merge commit 48814: 2021-03-23 23:59:37 +00:00
tcl Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
tosunits Merge commit 48814: 2021-03-23 23:59:37 +00:00
tplylib Merge commit 48814: 2021-03-23 23:59:37 +00:00
univint Merge commit 48814: 2021-03-23 23:59:37 +00:00
unixutil Merge commit 48814: 2021-03-23 23:59:37 +00:00
unzip Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
users Merge commit 48814: 2021-03-23 23:59:37 +00:00
utmp Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
uuid Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
vcl-compat Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
webidl Merge commit 48814: 2021-03-23 23:59:37 +00:00
winceunits Merge commit 48814: 2021-03-23 23:59:37 +00:00
winunits-base --- Merging r47891 into '.': 2020-12-30 13:47:27 +00:00
winunits-jedi Merge commit 48814: 2021-03-23 23:59:37 +00:00
x11 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
xforms Merge commit 48814: 2021-03-23 23:59:37 +00:00
zlib Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
zorba Merge commit 48814: 2021-03-23 23:59:37 +00:00
fpmake_add.inc # revisions: 46370,46371,46372,46373,46374,46375,46376,46377,46378,46379,46380,46381,46382,46383,46384,46385,46386,46387,46388,46389,46390,46391,46392,46393,46394,46395,46397 2020-09-09 15:22:17 +00:00
fpmake_proc.inc # revisions: 46370,46371,46372,46373,46374,46375,46376,46377,46378,46379,46380,46381,46382,46383,46384,46385,46386,46387,46388,46389,46390,46391,46392,46393,46394,46395,46397 2020-09-09 15:22:17 +00:00
fpmake.pp Merge commit 48814: 2021-03-23 23:59:37 +00:00
Makefile Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini 2020-09-23 09:47:20 +00:00
Makefile.fpc --- Merging r43892 into '.': 2020-01-13 21:38:28 +00:00
Makefile.fpc.fpcmake