marco 3f6fb1340c --- Merging r37148 into '.': ... U packages/winunits-jedi/src/jwawincrypt.pas G . --- Recording mergeinfo for merge of r37148 into '.': G . git-svn-id: tags/release_3_0_4@37149 -		2017-09-05 17:14:06 +00:00
..
a52	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
ami-extra	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
amunits	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
arosunits	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
aspell	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
bfd	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
bzip2	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
cairo	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
cdrom	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
chm	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
cocoaint	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
dblib	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
dbus	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
dts	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fastcgi	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-async	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-base	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-db	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-extra	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-fpcunit	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-image	--- Merging r37126 into '.':	2017-09-03 15:07:30 +00:00
fcl-js	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-json	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-net	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-passrc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-pdf	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-process	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-registry	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-res	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-sdo	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-sound	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-stl	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-web	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fcl-xml	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fftw	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fpgtk	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fpindexer	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fpmkunit	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fppkg	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fuse	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
fv	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
gdbint	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
gdbm	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
ggi	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
gmp	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
gnome1	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
googleapi	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
graph	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
gtk1	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
gtk2	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
hash	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
hermes	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
httpd13	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
httpd20	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
httpd22	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
httpd24	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
ibase	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
iconvenc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
imagemagick	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
imlib	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
iosxlocale	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
jni	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
ldap	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libcurl	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libgbafpc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libgd	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libmicrohttpd	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libndsfpc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libogcfpc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libpng	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
librsvg	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libsee	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libtar	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libvlc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
libxml	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
lua	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
mad	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
matroska	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
modplug	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
morphunits	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
mysql	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
ncurses	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
newt	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
numlib	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
nvapi	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
objcrtl	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
odbc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
oggvorbis	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
openal	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
opencl	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
opengl	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
opengles	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
openssl	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
oracle	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
os2units	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
palmunits	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
pasjpeg	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
pastojs	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
paszlib	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
pcap	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
postgres	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
proj4	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
ptc	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
pthreads	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
pxlib	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
regexpr	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
rexx	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
rtl-console	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
rtl-extra	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
rtl-objpas	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
rtl-unicode	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
sdl	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
sndfile	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
sqlite	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
svgalib	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
symbolic	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
syslog	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
tcl	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
univint	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
unixutil	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
unzip	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
users	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
utmp	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
uuid	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
winceunits	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
winunits-base	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
winunits-jedi	--- Merging r37148 into '.':	2017-09-05 17:14:06 +00:00
x11	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
xforms	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
zlib	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
zorba	* update to v 3.0.4	2017-09-02 16:48:24 +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	* update to v 3.0.4	2017-09-02 16:48:24 +00:00
Makefile	* update to v 3.0.4	2017-09-02 16:48:24 +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