3 Commits

Author	SHA1	Message	Date
marco	9a0f43104c	* makefile regen and version updates. ... git-svn-id: branches/fixes_3_0@29416 -	2015-01-05 15:04:54 +00:00
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
marco	dcbe6952c3	--- Merging r29403 into '.': ... U packages/amunits/src/coreunits/iffparse.pas U packages/morphunits/src/iffparse.pas --- Merging r29404 into '.': A packages/ami-extra A packages/ami-extra/README.txt A packages/ami-extra/Makefile A packages/ami-extra/fpmake.pp A packages/ami-extra/Makefile.fpc A packages/ami-extra/src A packages/ami-extra/src/cliputils.pas A packages/ami-extra/Makefile.fpc.fpcmake --- Merging r29405 into '.': U packages/Makefile.fpc.fpcmake U packages/fpmake_proc.inc U packages/fpmake_add.inc --- Merging r29406 into '.': U ide/winclip.pas U ide/fphelp.pas U ide/fpide.pas U ide/globdir.inc # revisions: 29403,29404,29405,29406 git-svn-id: branches/fixes_3_0@29413 -	2015-01-05 13:35:29 +00:00