marco b0ef30d9c3 --- Merging r36812 into '.': ... U packages/fcl-db/src/base/dataset.inc --- Recording mergeinfo for merge of r36812 into '.': U . # revisions: 36812 git-svn-id: branches/fixes_3_0@38405 -		2018-03-04 12:52:48 +00:00
..
a52	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
ami-extra	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
amunits	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
arosunits	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
aspell	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
bfd	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
bzip2	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
cairo	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
cdrom	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
chm	--- Merging r37714 into '.':	2018-01-25 13:06:30 +00:00
cocoaint	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
dblib	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
dbus	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
dts	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fastcgi	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-async	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-base	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-db	--- Merging r36812 into '.':	2018-03-04 12:52:48 +00:00
fcl-extra	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-fpcunit	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-image	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-js	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-json	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-net	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-passrc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-pdf	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-process	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-registry	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-res	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-sdo	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-sound	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-stl	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fcl-web	--- Merging r37854 into '.':	2018-01-10 06:44:14 +00:00
fcl-xml	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fftw	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fpgtk	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fpindexer	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fpmkunit	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fppkg	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fuse	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
fv	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
gdbint	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
gdbm	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
ggi	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
gmp	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
gnome1	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
googleapi	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
graph	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
gtk1	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
gtk2	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
hash	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
hermes	--- Merging r38126 into '.':	2018-02-16 10:29:50 +00:00
httpd13	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
httpd20	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
httpd22	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
httpd24	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
ibase	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
iconvenc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
imagemagick	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
imlib	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
iosxlocale	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
jni	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
ldap	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libcurl	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libgbafpc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libgd	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libmicrohttpd	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libndsfpc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libogcfpc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libpng	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
librsvg	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libsee	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libtar	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libvlc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
libxml	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
lua	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
mad	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
matroska	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
modplug	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
morphunits	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
mysql	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
ncurses	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
newt	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
numlib	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
nvapi	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
objcrtl	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
odbc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
oggvorbis	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
openal	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
opencl	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
opengl	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
opengles	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
openssl	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
oracle	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
os2units	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
palmunits	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
pasjpeg	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
pastojs	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
paszlib	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
pcap	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
postgres	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
proj4	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
ptc	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
pthreads	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
pxlib	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
regexpr	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
rexx	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
rtl-console	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
rtl-extra	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
rtl-objpas	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
rtl-unicode	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
sdl	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
sndfile	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
sqlite	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
svgalib	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
symbolic	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
syslog	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
tcl	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
univint	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
unixutil	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
unzip	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
users	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
utmp	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
uuid	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
winceunits	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
winunits-base	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
winunits-jedi	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
x11	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
xforms	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
zlib	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
zorba	* version updates to 3.0.5	2017-12-01 14:53:04 +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	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
Makefile	* version updates to 3.0.5	2017-12-01 14:53:04 +00:00
Makefile.fpc	* Merge of several fixes for ppudump tests used in regular tests for ppudump output.	2017-10-16 17:16:35 +00:00
Makefile.fpc.fpcmake	--- Merging r29403 into '.':	2015-01-05 13:35:29 +00:00