paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 21:07:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
3.2.3
fpc/packages
History
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
..
a52 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
ami-extra --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
amunits --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
arosunits --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
aspell --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
bfd --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
bzip2 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
cairo --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
cdrom --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
chm --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
cocoaint --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
dblib --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
dbus --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
dts --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fastcgi --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-async --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-base --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-db --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-extra --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-fpcunit --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-image --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-js --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-json --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-net --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-passrc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-pdf --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-process --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-registry --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-report --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-res --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-sdo --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-sound --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-stl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-web --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fcl-xml --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fftw --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fpgtk --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fpindexer --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fpmkunit --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fppkg --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fuse --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
fv --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
gdbint --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
gdbm --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
ggi --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
gmp --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
gnome1 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
gnutls --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
googleapi --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
graph --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
gtk1 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
gtk2 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
hash --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
hermes --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
httpd13 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
httpd20 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
httpd22 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
httpd24 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
ibase --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
iconvenc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
ide --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
imagemagick --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
imlib --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
iosxlocale --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
jni --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
ldap --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libcups --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libcurl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libenet --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libffi --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libfontconfig --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libgbafpc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libgc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libgd --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libmagic --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libmicrohttpd --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libndsfpc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libogcfpc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libpng --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
librsvg --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libsee --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libtar --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libusb --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libvlc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
libxml --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
lua --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
mad --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
matroska --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
modplug --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
morphunits --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
mysql --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
ncurses --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
newt --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
numlib --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
nvapi --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
objcrtl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
odata --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
odbc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
oggvorbis --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
openal --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
opencl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
opengl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
opengles --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
openssl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
oracle --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
os2units --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
os4units --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
palmunits --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
pasjpeg --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
pastojs --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
paszlib --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
pcap --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
postgres --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
proj4 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
ptc --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
pthreads --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
pxlib --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
regexpr --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
rexx --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
rtl-console --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
rtl-extra --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
rtl-generics --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
rtl-objpas --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
rtl-unicode --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
sdl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
sndfile --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
sqlite --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
svgalib --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
symbolic --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
syslog --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
tcl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
tosunits --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
tplylib --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
univint --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
unixutil --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
unzip --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
users --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
utmp --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
uuid --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
vcl-compat --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
webidl --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
winceunits --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
winunits-base --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
winunits-jedi --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
x11 --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
xforms --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
zlib --- Merging r49045 into '.': 2021-05-20 20:03:52 +00:00
zorba --- Merging r49045 into '.': 2021-05-20 20:03:52 +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 --- Merging r49045 into '.': 2021-05-20 20:03:52 +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