fpc/packages
marco 6e54b04036 --- Merging r33947 into '.':
U    packages/fcl-base/src/fpexprpars.pp
U    packages/fcl-base/tests/fclbase-unittests.lpi
U    packages/fcl-base/tests/testexprpars.pp
U    packages/fcl-base/tests/fclbase-unittests.pp
--- Recording mergeinfo for merge of r33947 into '.':
 U   .
--- Merging r33986 into '.':
G    packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r33986 into '.':
 G   .
--- Merging r34377 into '.':
G    packages/fcl-base/src/fpexprpars.pp
G    packages/fcl-base/tests/testexprpars.pp
--- Recording mergeinfo for merge of r34377 into '.':
 G   .
--- Merging r34422 into '.':
G    packages/fcl-base/tests/testexprpars.pp
G    packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r34422 into '.':
 G   .
--- Merging r34423 into '.':
G    packages/fcl-base/src/fpexprpars.pp
G    packages/fcl-base/tests/testexprpars.pp
--- Recording mergeinfo for merge of r34423 into '.':
 G   .
--- Merging r34967 into '.':
G    packages/fcl-base/tests/testexprpars.pp
G    packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r34967 into '.':
 G   .
--- Merging r35006 into '.':
G    packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r35006 into '.':
 G   .

# revisions: 33947,33986,34377,34422,34423,34967,35006

git-svn-id: branches/fixes_3_0@36537 -
2017-06-19 09:01:02 +00:00
..
a52 * version updates 2017-02-13 08:24:06 +00:00
ami-extra --- Merging r33481 into '.': 2017-04-27 16:22:34 +00:00
amunits * version updates 2017-02-13 08:24:06 +00:00
arosunits * version updates 2017-02-13 08:24:06 +00:00
aspell * version updates 2017-02-13 08:24:06 +00:00
bfd * version updates 2017-02-13 08:24:06 +00:00
bzip2 * version updates 2017-02-13 08:24:06 +00:00
cairo * version updates 2017-02-13 08:24:06 +00:00
cdrom * version updates 2017-02-13 08:24:06 +00:00
chm * version updates 2017-02-13 08:24:06 +00:00
cocoaint * version updates 2017-02-13 08:24:06 +00:00
dblib --- Merging r34244 into '.': 2017-04-28 12:46:04 +00:00
dbus * version updates 2017-02-13 08:24:06 +00:00
dts * version updates 2017-02-13 08:24:06 +00:00
fastcgi * version updates 2017-02-13 08:24:06 +00:00
fcl-async * version updates 2017-02-13 08:24:06 +00:00
fcl-base --- Merging r33947 into '.': 2017-06-19 09:01:02 +00:00
fcl-db --- Merging r35421 into '.': 2017-06-04 16:55:26 +00:00
fcl-extra * version updates 2017-02-13 08:24:06 +00:00
fcl-fpcunit --- Merging r35878 into '.': 2017-06-19 07:01:32 +00:00
fcl-image --- Merging r36400 into '.': 2017-06-19 08:51:02 +00:00
fcl-js --- Merging r35789 into '.': 2017-06-19 08:47:41 +00:00
fcl-json --- Merging r35565 into '.': 2017-04-27 19:48:42 +00:00
fcl-net --- Merging r35520 into '.': 2017-05-04 11:18:04 +00:00
fcl-passrc --- Merging r36006 into '.': 2017-06-19 08:32:23 +00:00
fcl-pdf * Merge revisions r36355,r36356,r36357,r36358 from trunk: 2017-05-28 09:10:15 +00:00
fcl-process --- Merging r33481 into '.': 2017-04-27 16:22:34 +00:00
fcl-registry --- Merging r34492 into '.': 2017-04-29 15:23:46 +00:00
fcl-res * version updates 2017-02-13 08:24:06 +00:00
fcl-sdo * version updates 2017-02-13 08:24:06 +00:00
fcl-sound * version updates 2017-02-13 08:24:06 +00:00
fcl-stl * version updates 2017-02-13 08:24:06 +00:00
fcl-web --- Merging r35822 into '.': 2017-04-27 21:58:47 +00:00
fcl-xml * version updates 2017-02-13 08:24:06 +00:00
fftw * version updates 2017-02-13 08:24:06 +00:00
fpgtk --- Merging r34818 into '.': 2017-04-27 16:59:34 +00:00
fpindexer * version updates 2017-02-13 08:24:06 +00:00
fpmkunit --- Merging r30083 into '.': 2017-04-28 14:31:12 +00:00
fppkg --- Merging r33481 into '.': 2017-04-27 16:22:34 +00:00
fuse * version updates 2017-02-13 08:24:06 +00:00
fv --- Merging r33481 into '.': 2017-04-27 16:22:34 +00:00
gdbint * version updates 2017-02-13 08:24:06 +00:00
gdbm * version updates 2017-02-13 08:24:06 +00:00
ggi * version updates 2017-02-13 08:24:06 +00:00
gmp * version updates 2017-02-13 08:24:06 +00:00
gnome1 * version updates 2017-02-13 08:24:06 +00:00
googleapi --- Merging r33481 into '.': 2017-04-27 16:22:34 +00:00
graph * version updates 2017-02-13 08:24:06 +00:00
gtk1 * version updates 2017-02-13 08:24:06 +00:00
gtk2 * version updates 2017-02-13 08:24:06 +00:00
hash * version updates 2017-02-13 08:24:06 +00:00
hermes * version updates 2017-02-13 08:24:06 +00:00
httpd13 * version updates 2017-02-13 08:24:06 +00:00
httpd20 * version updates 2017-02-13 08:24:06 +00:00
httpd22 * version updates 2017-02-13 08:24:06 +00:00
httpd24 * version updates 2017-02-13 08:24:06 +00:00
ibase * version updates 2017-02-13 08:24:06 +00:00
iconvenc * version updates 2017-02-13 08:24:06 +00:00
imagemagick * version updates 2017-02-13 08:24:06 +00:00
imlib * version updates 2017-02-13 08:24:06 +00:00
iosxlocale * version updates 2017-02-13 08:24:06 +00:00
jni * version updates 2017-02-13 08:24:06 +00:00
ldap * version updates 2017-02-13 08:24:06 +00:00
libc * version updates 2017-02-13 08:24:06 +00:00
libcurl * version updates 2017-02-13 08:24:06 +00:00
libgbafpc * version updates 2017-02-13 08:24:06 +00:00
libgd --- Merging r30083 into '.': 2017-04-28 14:31:12 +00:00
libmicrohttpd * version updates 2017-02-13 08:24:06 +00:00
libndsfpc * version updates 2017-02-13 08:24:06 +00:00
libogcfpc * version updates 2017-02-13 08:24:06 +00:00
libpng * version updates 2017-02-13 08:24:06 +00:00
librsvg * version updates 2017-02-13 08:24:06 +00:00
libsee * version updates 2017-02-13 08:24:06 +00:00
libtar --- Merging r35498 into '.': 2017-04-29 15:19:34 +00:00
libvlc --- Merging r36341 into '.': 2017-06-01 08:22:58 +00:00
libxml * version updates 2017-02-13 08:24:06 +00:00
lua * version updates 2017-02-13 08:24:06 +00:00
mad * version updates 2017-02-13 08:24:06 +00:00
matroska * version updates 2017-02-13 08:24:06 +00:00
modplug * version updates 2017-02-13 08:24:06 +00:00
morphunits * version updates 2017-02-13 08:24:06 +00:00
mysql * version updates 2017-02-13 08:24:06 +00:00
ncurses * version updates 2017-02-13 08:24:06 +00:00
newt * version updates 2017-02-13 08:24:06 +00:00
numlib --- Merging r35594 into '.': 2017-05-01 20:23:28 +00:00
nvapi * version updates 2017-02-13 08:24:06 +00:00
objcrtl * version updates 2017-02-13 08:24:06 +00:00
odbc --- Merging r34618 into '.': 2017-04-29 12:50:07 +00:00
oggvorbis * version updates 2017-02-13 08:24:06 +00:00
openal * version updates 2017-02-13 08:24:06 +00:00
opencl * version updates 2017-02-13 08:24:06 +00:00
opengl * version updates 2017-02-13 08:24:06 +00:00
opengles * version updates 2017-02-13 08:24:06 +00:00
openssl * version updates 2017-02-13 08:24:06 +00:00
oracle * version updates 2017-02-13 08:24:06 +00:00
os2units * version updates 2017-02-13 08:24:06 +00:00
palmunits * version updates 2017-02-13 08:24:06 +00:00
pasjpeg * version updates 2017-02-13 08:24:06 +00:00
pastojs --- Merging r35789 into '.': 2017-06-19 08:47:41 +00:00
paszlib --- Merging r35466 into '.': 2017-05-04 11:19:09 +00:00
pcap * version updates 2017-02-13 08:24:06 +00:00
postgres --- Merging r33254 into '.': 2017-04-28 12:38:15 +00:00
proj4 * version updates 2017-02-13 08:24:06 +00:00
ptc --- Merging r35752 into '.': 2017-04-29 14:59:58 +00:00
pthreads * version updates 2017-02-13 08:24:06 +00:00
pxlib * version updates 2017-02-13 08:24:06 +00:00
regexpr * version updates 2017-02-13 08:24:06 +00:00
rexx * version updates 2017-02-13 08:24:06 +00:00
rtl-console --- Merging r31855 into '.': 2017-04-29 16:05:31 +00:00
rtl-extra --- Merging r30083 into '.': 2017-04-28 14:31:12 +00:00
rtl-objpas --- Merging r36343 into '.': 2017-05-28 18:19:33 +00:00
rtl-unicode --- Merging r30083 into '.': 2017-04-28 14:31:12 +00:00
sdl --- Merging r30083 into '.': 2017-04-28 14:31:12 +00:00
sndfile * version updates 2017-02-13 08:24:06 +00:00
sqlite --- Merging r34618 into '.': 2017-04-29 12:50:07 +00:00
svgalib * version updates 2017-02-13 08:24:06 +00:00
symbolic * version updates 2017-02-13 08:24:06 +00:00
syslog * version updates 2017-02-13 08:24:06 +00:00
tcl * version updates 2017-02-13 08:24:06 +00:00
univint * version updates 2017-02-13 08:24:06 +00:00
unixutil * version updates 2017-02-13 08:24:06 +00:00
unzip * version updates 2017-02-13 08:24:06 +00:00
users * version updates 2017-02-13 08:24:06 +00:00
utmp * version updates 2017-02-13 08:24:06 +00:00
uuid * version updates 2017-02-13 08:24:06 +00:00
winceunits * version updates 2017-02-13 08:24:06 +00:00
winunits-base --- Merging r34818 into '.': 2017-04-27 16:59:34 +00:00
winunits-jedi --- Merging r34818 into '.': 2017-04-27 16:59:34 +00:00
x11 --- Merging r36461 into '.': 2017-06-10 15:52:14 +00:00
xforms * version updates 2017-02-13 08:24:06 +00:00
zlib * version updates 2017-02-13 08:24:06 +00:00
zorba * version updates 2017-02-13 08:24:06 +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 2017-02-13 08:24:06 +00:00
Makefile * version updates 2017-02-13 08:24:06 +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