paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-25 04:48:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
e831fde4b6
fpc/packages
History
marco e831fde4b6 --- Merging r29409 into '.': 
U    packages/zorba/Makefile
U    packages/zorba/Makefile.fpc
U    packages/rtl-extra/Makefile.fpc
U    packages/rtl-extra/Makefile
U    packages/opengl/Makefile
U    packages/opengl/Makefile.fpc
U    packages/fcl-extra/Makefile
U    packages/fcl-extra/Makefile.fpc
U    packages/os2units/Makefile
U    packages/os2units/Makefile.fpc
U    packages/gnome1/Makefile.fpc
U    packages/gnome1/Makefile
U    packages/imlib/Makefile
U    packages/imlib/Makefile.fpc
U    packages/sqlite/Makefile.fpc
U    packages/sqlite/Makefile
U    packages/graph/Makefile
U    packages/graph/Makefile.fpc
U    packages/unzip/Makefile.fpc
U    packages/unzip/Makefile
U    packages/uuid/Makefile
U    packages/uuid/Makefile.fpc
U    packages/fftw/Makefile
U    packages/fftw/Makefile.fpc
U    packages/librsvg/Makefile
U    packages/librsvg/Makefile.fpc
U    packages/libvlc/Makefile.fpc
U    packages/libvlc/Makefile
U    packages/rtl-objpas/Makefile
U    packages/rtl-objpas/Makefile.fpc
U    packages/nvapi/Makefile.fpc
U    packages/nvapi/Makefile
U    packages/sndfile/Makefile.fpc
U    packages/sndfile/Makefile
U    packages/svgalib/Makefile
U    packages/svgalib/Makefile.fpc
U    packages/bfd/Makefile.fpc
U    packages/bfd/Makefile
U    packages/proj4/Makefile.fpc
U    packages/proj4/Makefile
U    packages/iosxlocale/Makefile
U    packages/iosxlocale/Makefile.fpc
U    packages/paszlib/Makefile.fpc
U    packages/paszlib/Makefile
U    packages/libgbafpc/Makefile
U    packages/libgbafpc/Makefile.fpc
U    packages/fcl-registry/Makefile
U    packages/fcl-registry/Makefile.fpc
U    packages/regexpr/Makefile
U    packages/regexpr/Makefile.fpc
U    packages/libtar/Makefile.fpc
U    packages/libtar/Makefile
U    packages/newt/Makefile
U    packages/newt/Makefile.fpc
U    packages/xforms/Makefile.fpc
U    packages/xforms/Makefile
U    packages/openal/Makefile
U    packages/openal/Makefile.fpc
U    packages/aspell/Makefile
U    packages/aspell/Makefile.fpc
U    packages/jni/Makefile.fpc
U    packages/jni/Makefile
U    packages/libgd/Makefile
U    packages/libgd/Makefile.fpc
U    packages/symbolic/Makefile.fpc
U    packages/symbolic/Makefile
U    packages/ncurses/Makefile
U    packages/ncurses/Makefile.fpc
U    packages/sdl/Makefile
U    packages/sdl/Makefile.fpc
U    packages/arosunits/Makefile.fpc
U    packages/arosunits/Makefile
U    packages/fcl-net/Makefile
U    packages/fcl-net/Makefile.fpc
U    packages/fcl-res/Makefile
U    packages/fcl-res/Makefile.fpc
U    packages/mad/Makefile
U    packages/mad/Makefile.fpc
U    packages/oracle/Makefile
U    packages/oracle/Makefile.fpc
U    packages/dblib/Makefile
U    packages/dblib/Makefile.fpc
U    packages/palmunits/Makefile.fpc
U    packages/palmunits/Makefile
U    packages/fcl-js/Makefile.fpc
U    packages/fcl-js/Makefile
U    packages/ldap/Makefile
U    packages/ldap/Makefile.fpc
U    packages/matroska/Makefile
U    packages/matroska/Makefile.fpc
U    packages/tcl/Makefile.fpc
U    packages/tcl/Makefile
U    packages/ibase/Makefile
U    packages/ibase/Makefile.fpc
U    packages/hash/Makefile
U    packages/hash/Makefile.fpc
U    packages/gmp/Makefile.fpc
U    packages/gmp/Makefile
U    packages/openssl/Makefile
U    packages/openssl/Makefile.fpc
U    packages/utmp/Makefile.fpc
U    packages/utmp/Makefile
C    packages/bzip2/Makefile
U    packages/bzip2/Makefile.fpc
U    packages/httpd13/Makefile
U    packages/httpd13/Makefile.fpc
U    packages/a52/Makefile.fpc
U    packages/a52/Makefile
U    packages/fcl-sdo/Makefile.fpc
U    packages/fcl-sdo/Makefile
U    packages/winunits-base/Makefile
U    packages/winunits-base/Makefile.fpc
U    packages/fcl-sound/Makefile.fpc
U    packages/fcl-sound/Makefile
U    packages/libcurl/Makefile
U    packages/libcurl/Makefile.fpc
U    packages/dbus/Makefile
U    packages/dbus/Makefile.fpc
U    packages/libsee/Makefile
U    packages/libsee/Makefile.fpc
U    packages/fcl-stl/Makefile.fpc
U    packages/fcl-stl/Makefile
U    packages/libndsfpc/Makefile.fpc
U    packages/libndsfpc/Makefile
U    packages/mysql/Makefile.fpc
U    packages/mysql/Makefile
U    packages/gdbint/Makefile
U    packages/gdbint/Makefile.fpc
U    packages/fcl-base/Makefile.fpc
U    packages/fcl-base/Makefile
U    packages/opengles/Makefile.fpc
U    packages/opengles/Makefile
U    packages/fcl-web/Makefile
U    packages/fcl-web/Makefile.fpc
U    packages/opencl/Makefile
U    packages/opencl/Makefile.fpc
U    packages/hermes/Makefile
U    packages/hermes/Makefile.fpc
U    packages/httpd20/Makefile.fpc
U    packages/httpd20/Makefile
U    packages/ptc/Makefile
U    packages/ptc/Makefile.fpc
U    packages/httpd22/Makefile.fpc
U    packages/httpd22/Makefile
U    packages/ami-extra/Makefile
U    packages/ami-extra/Makefile.fpc
U    packages/fcl-db/Makefile
U    packages/fcl-db/Makefile.fpc
U    packages/libogcfpc/Makefile
U    packages/libogcfpc/Makefile.fpc
U    packages/winunits-jedi/Makefile.fpc
U    packages/winunits-jedi/Makefile
U    packages/httpd24/Makefile.fpc
U    packages/httpd24/Makefile
U    packages/dts/Makefile.fpc
U    packages/dts/Makefile
U    packages/univint/Makefile
U    packages/univint/Makefile.fpc
U    packages/cocoaint/Makefile
U    packages/cocoaint/Makefile.fpc
U    packages/rtl-console/Makefile
U    packages/rtl-console/Makefile.fpc
U    packages/gtk1/Makefile.fpc
U    packages/gtk1/Makefile
U    packages/ggi/Makefile.fpc
U    packages/ggi/Makefile
U    packages/gtk2/Makefile
U    packages/gtk2/Makefile.fpc
U    packages/odbc/Makefile
U    packages/odbc/Makefile.fpc
U    packages/morphunits/Makefile
U    packages/morphunits/Makefile.fpc
U    packages/gdbm/Makefile
U    packages/gdbm/Makefile.fpc
U    packages/pthreads/Makefile
U    packages/pthreads/Makefile.fpc
U    packages/fcl-json/Makefile
U    packages/fcl-json/Makefile.fpc
U    packages/amunits/Makefile.fpc
U    packages/amunits/Makefile
U    packages/unixutil/Makefile
U    packages/unixutil/Makefile.fpc
U    packages/lua/Makefile.fpc
U    packages/lua/Makefile
U    packages/pcap/Makefile.fpc
U    packages/pcap/Makefile
U    packages/fcl-image/Makefile.fpc
U    packages/fcl-image/Makefile
U    packages/numlib/Makefile
U    packages/numlib/Makefile.fpc
U    packages/winceunits/Makefile.fpc
U    packages/winceunits/Makefile
U    packages/pasjpeg/Makefile
U    packages/pasjpeg/Makefile.fpc
U    packages/zlib/Makefile.fpc
U    packages/zlib/Makefile
U    packages/fuse/Makefile
U    packages/fuse/Makefile.fpc
U    packages/iconvenc/Makefile
U    packages/iconvenc/Makefile.fpc
U    packages/chm/Makefile.fpc
U    packages/chm/Makefile
U    packages/libc/Makefile
U    packages/libc/Makefile.fpc
U    packages/x11/Makefile
U    packages/x11/Makefile.fpc
U    packages/pxlib/Makefile
U    packages/pxlib/Makefile.fpc
U    packages/fpindexer/Makefile
U    packages/fpindexer/Makefile.fpc
U    packages/libxml/Makefile.fpc
U    packages/libxml/Makefile
U    packages/imagemagick/Makefile
U    packages/imagemagick/Makefile.fpc
U    packages/objcrtl/Makefile
U    packages/objcrtl/Makefile.fpc
U    packages/oggvorbis/Makefile.fpc
U    packages/oggvorbis/Makefile
U    packages/users/Makefile.fpc
U    packages/users/Makefile
U    packages/fcl-xml/Makefile
U    packages/fcl-xml/Makefile.fpc
U    packages/fcl-fpcunit/Makefile.fpc
U    packages/fcl-fpcunit/Makefile
U    packages/fpgtk/Makefile.fpc
U    packages/fpgtk/Makefile
U    packages/libpng/Makefile
U    packages/libpng/Makefile.fpc
U    packages/fcl-async/Makefile
U    packages/fcl-async/Makefile.fpc
U    packages/fastcgi/Makefile.fpc
U    packages/fastcgi/Makefile
U    packages/fcl-process/Makefile
U    packages/fcl-process/Makefile.fpc
U    packages/syslog/Makefile.fpc
U    packages/syslog/Makefile
C    packages/pastojs/Makefile
U    packages/pastojs/Makefile.fpc
U    packages/rtl-unicode/Makefile
U    packages/rtl-unicode/Makefile.fpc
U    packages/rexx/Makefile.fpc
U    packages/rexx/Makefile
U    packages/fcl-passrc/Makefile.fpc
U    packages/fcl-passrc/Makefile
U    packages/cairo/Makefile
U    packages/cairo/Makefile.fpc
U    packages/cdrom/Makefile
U    packages/cdrom/Makefile.fpc
U    packages/postgres/Makefile
U    packages/postgres/Makefile.fpc
U    packages/modplug/Makefile.fpc
U    packages/modplug/Makefile
U    packages/fppkg/Makefile.fpc
U    packages/fppkg/Makefile
U    packages/fv/Makefile.fpc
U    packages/fv/Makefile
Summary of conflicts:
  Text conflicts: 2

# revisions: 29409

git-svn-id: branches/fixes_3_0@29414 -
2015-01-05 13:51:02 +00:00
..
a52 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
ami-extra --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
amunits --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
arosunits --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
aspell --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
bfd --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
bzip2 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
cairo --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
cdrom --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
chm --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
cocoaint --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
dblib --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
dbus --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
dts --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fastcgi --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-async --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-base --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-db --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-extra --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-fpcunit --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-image --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-js --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-json --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-net --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-passrc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-process --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-registry --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-res --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-sdo --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-sound --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-stl --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-web --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fcl-xml --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fftw --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fpgtk --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fpindexer --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fpmkunit * Added missing path-delimiter between target and packagevariant path 2015-01-01 13:55:51 +00:00
fppkg --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fuse --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fv --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
gdbint --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
gdbm --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
ggi --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
gmp --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
gnome1 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
graph --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
gtk1 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
gtk2 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
hash --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
hermes --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
httpd13 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
httpd20 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
httpd22 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
httpd24 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
ibase --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
iconvenc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
imagemagick --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
imlib --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
iosxlocale --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
jni --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
ldap --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libcurl --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libgbafpc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libgd --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libndsfpc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libogcfpc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libpng --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
librsvg --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libsee --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libtar --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libvlc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
libxml --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
lua --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
mad --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
matroska --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
modplug --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
morphunits --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
mysql --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
ncurses --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
newt --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
numlib --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
nvapi --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
objcrtl --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
odbc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
oggvorbis --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
openal --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
opencl --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
opengl --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
opengles --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
openssl --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
oracle --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
os2units --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
palmunits --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
pasjpeg --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
pastojs --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
paszlib --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
pcap --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
postgres --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
proj4 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
ptc --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
pthreads --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
pxlib --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
regexpr --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
rexx --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
rtl-console --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
rtl-extra --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
rtl-objpas --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
rtl-unicode --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
sdl --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
sndfile --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
sqlite --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
svgalib --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
symbolic --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
syslog --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
tcl --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
univint --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
unixutil --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
unzip --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
users --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
utmp --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
uuid --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
winceunits --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
winunits-base --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
winunits-jedi --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
x11 --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
xforms --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
zlib --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
zorba --- Merging r29409 into '.': 2015-01-05 13:51:02 +00:00
fpmake_add.inc --- Merging r29403 into '.': 2015-01-05 13:35:29 +00:00
fpmake_proc.inc --- Merging r29403 into '.': 2015-01-05 13:35:29 +00:00
fpmake.pp * Add data2inc and genfpmkunit options to combined packages-fpmake.pp 2014-12-03 20:52:14 +00:00
Makefile * Placed bootstrapping the fpmkunit in a separate make-target 2014-12-10 21:46:15 +00:00
Makefile.fpc * Placed bootstrapping the fpmkunit in a separate make-target 2014-12-10 21:46:15 +00:00
Makefile.fpc.fpcmake --- Merging r29403 into '.': 2015-01-05 13:35:29 +00:00