fpc/packages
marco 801d1e32d1 --- Merging r34912 into '.':
U    packages/fv/examples/testapp.lpi
--- Recording mergeinfo for merge of r34912 into '.':
 U   .

# revisions: 34912

git-svn-id: branches/fixes_3_0@34913 -
2016-11-18 09:25:20 +00:00
..
a52 * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
ami-extra * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
amunits * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
arosunits * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
aspell --- Merging r32074 into '.': 2015-11-04 20:59:27 +00:00
bfd * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
bzip2 * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
cairo * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
cdrom --- Merging r33882 into '.': 2016-06-02 20:13:06 +00:00
chm --- Merging r32629 into '.': 2016-05-11 09:24:33 +00:00
cocoaint * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
dblib * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
dbus * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
dts * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
fastcgi * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
fcl-async * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
fcl-base --- Merging r33697 into '.': 2016-05-26 14:48:46 +00:00
fcl-db --- Merging r33882 into '.': 2016-06-02 20:13:06 +00:00
fcl-extra * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
fcl-fpcunit # revisions: 32918,32986,32960,33044,33171,33266,33296,33297,33298,33333,33335,33336,33337,33345,33348 2016-05-22 16:22:11 +00:00
fcl-image --- Merging r33761 into '.': 2016-05-26 12:47:14 +00:00
fcl-js * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
fcl-json --- Merging r33397 into '.': 2016-03-31 13:19:05 +00:00
fcl-net --- Merging r33882 into '.': 2016-06-02 20:13:06 +00:00
fcl-passrc * Patch from Mattias Gaertner to clean up unused resource strings 2016-07-14 06:49:27 +00:00
fcl-pdf --- Merging r33917 into '.': 2016-06-05 18:51:14 +00:00
fcl-process --- Merging r33697 into '.': 2016-05-26 14:48:46 +00:00
fcl-registry # revisions: 32918,32986,32960,33044,33171,33266,33296,33297,33298,33333,33335,33336,33337,33345,33348 2016-05-22 16:22:11 +00:00
fcl-res --- Merging r31191 into '.': 2015-12-16 15:28:03 +00:00
fcl-sdo --- Merging r33882 into '.': 2016-06-02 20:13:06 +00:00
fcl-sound * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
fcl-stl --- Merging r31381 into '.': 2016-04-01 09:44:15 +00:00
fcl-web --- Merging r34062 into '.': 2016-07-13 15:47:23 +00:00
fcl-xml --- Merging r33882 into '.': 2016-06-02 20:13:06 +00:00
fftw * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
fpgtk * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
fpindexer * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
fpmkunit --- Merging r31191 into '.': 2015-12-16 15:28:03 +00:00
fppkg --- Merging r32274 into '.': 2015-11-12 18:12:54 +00:00
fuse * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
fv --- Merging r34912 into '.': 2016-11-18 09:25:20 +00:00
gdbint --- Merging r32124 into '.': 2015-11-04 21:11:04 +00:00
gdbm * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
ggi * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
gmp --- Merging r32449 into '.': 2016-03-28 14:35:56 +00:00
gnome1 * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
googleapi # revisions: 30794,30828,30829,30830,30831,30832,30859,30867,31019,32725,33294,33774,33775,33776,33777 2016-05-24 19:31:58 +00:00
graph * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
gtk1 * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
gtk2 # revisions: 32918,32986,32960,33044,33171,33266,33296,33297,33298,33333,33335,33336,33337,33345,33348 2016-05-22 16:22:11 +00:00
hash # revisions: 33347,33406,33548,33576,33577,33578,33579,33602,33603,33683 2016-05-22 16:31:40 +00:00
hermes * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
httpd13 * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
httpd20 * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
httpd22 * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
httpd24 * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
ibase # revisions: 33347,33406,33548,33576,33577,33578,33579,33602,33603,33683 2016-05-22 16:31:40 +00:00
iconvenc * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
imagemagick --- Merging r32124 into '.': 2015-11-04 21:11:04 +00:00
imlib * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
iosxlocale * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
jni * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
ldap * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
libc * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
libcurl --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
libgbafpc --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
libgd --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
libmicrohttpd --- Merging r33898 into '.': 2016-06-04 10:18:09 +00:00
libndsfpc --- Merging r33429 into '.': 2016-05-30 12:31:17 +00:00
libogcfpc --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
libpng * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
librsvg --- Merging r33262 into '.': 2016-03-30 18:17:01 +00:00
libsee * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
libtar * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
libvlc * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
libxml --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
lua * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
mad * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
matroska * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
modplug * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
morphunits * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
mysql --- Merging r31310 into '.': 2016-03-28 14:38:47 +00:00
ncurses * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
newt * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
numlib --- Merging r29821 into '.': 2016-04-30 21:02:02 +00:00
nvapi * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
objcrtl * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
odbc --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
oggvorbis * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
openal * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
opencl * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
opengl --- Merging r31697 into '.': 2016-05-11 08:47:29 +00:00
opengles --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
openssl --- Merging r32795 into '.': 2016-05-22 15:38:29 +00:00
oracle * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
os2units --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
palmunits * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
pasjpeg * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
pastojs # revisions: 33347,33406,33548,33576,33577,33578,33579,33602,33603,33683 2016-05-22 16:31:40 +00:00
paszlib # revisions: 32918,32986,32960,33044,33171,33266,33296,33297,33298,33333,33335,33336,33337,33345,33348 2016-05-22 16:22:11 +00:00
pcap * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
postgres --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
proj4 * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
ptc --- Merging r33511 into '.': 2016-04-15 07:02:10 +00:00
pthreads * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
pxlib * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
regexpr --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
rexx * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
rtl-console --- Merging r29773 into '.': 2016-04-01 09:45:31 +00:00
rtl-extra # revisions: 33347,33406,33548,33576,33577,33578,33579,33602,33603,33683 2016-05-22 16:31:40 +00:00
rtl-objpas --- Merging r31356 into '.': 2016-06-29 19:32:08 +00:00
rtl-unicode # revisions: 33613,33629,33632,33708,33710,33728,33729,33730,33734,33742 2016-05-24 20:05:14 +00:00
sdl * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
sndfile * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
sqlite * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
svgalib --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
symbolic * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
syslog --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
tcl * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
univint --- Merging r34600 into '.': 2016-10-05 19:39:09 +00:00
unixutil * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
unzip * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
users * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
utmp * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
uuid --- Merging r32142 into '.': 2015-11-04 21:17:00 +00:00
winceunits * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
winunits-base --- Merging r32822 into '.': 2016-04-07 11:22:00 +00:00
winunits-jedi --- Merging r32795 into '.': 2016-05-22 15:38:29 +00:00
x11 * merged x11 revs Nikolay at his request. 2016-05-08 20:34:00 +00:00
xforms * Re-generated Makefile's 2015-10-10 20:05:14 +00:00
zlib * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
zorba * Re-generated Makefiles 2015-10-06 22:09:00 +00:00
fpmake_add.inc # revisions: 32067 2016-05-25 19:56:31 +00:00
fpmake_proc.inc # revisions: 32067 2016-05-25 19:56:31 +00:00
fpmake.pp * makefile regen and version updates. 2015-01-05 15:04:54 +00:00
Makefile --- Merging r31400 into '.': 2015-10-06 22:15:45 +00:00
Makefile.fpc --- Merging r31400 into '.': 2015-10-06 22:15:45 +00:00
Makefile.fpc.fpcmake --- Merging r29403 into '.': 2015-01-05 13:35:29 +00:00