fpc/packages/ami-extra
joost 2174581f6c --- Merging r31317 into '.':
C packages/googleapi
U    packages/nvapi/Makefile.fpc
U    packages/httpd13/Makefile.fpc
U    packages/proj4/Makefile.fpc
U    packages/odbc/Makefile.fpc
U    packages/openssl/Makefile.fpc
U    packages/rtl-unicode/Makefile.fpc
U    packages/fcl-sdo/Makefile.fpc
U    packages/libcurl/Makefile.fpc
U    packages/gtk1/Makefile.fpc
U    packages/libndsfpc/Makefile.fpc
U    packages/paszlib/Makefile.fpc
U    packages/cdrom/Makefile.fpc
U    packages/chm/Makefile.fpc
U    packages/fppkg/Makefile.fpc
U    packages/x11/Makefile.fpc
U    packages/regexpr/Makefile.fpc
U    packages/zorba/Makefile.fpc
U    packages/rtl-objpas/Makefile.fpc
U    packages/ldap/Makefile.fpc
U    packages/ncurses/Makefile.fpc
U    packages/hash/Makefile.fpc
U    packages/utmp/Makefile.fpc
U    packages/numlib/Makefile.fpc
U    packages/ami-extra/Makefile.fpc
U    packages/fcl-net/Makefile.fpc
U    packages/libogcfpc/Makefile.fpc
U    packages/fcl-res/Makefile.fpc
U    packages/imlib/Makefile.fpc
U    packages/dbus/Makefile.fpc
U    packages/imagemagick/Makefile.fpc
U    packages/graph/Makefile.fpc
U    packages/iosxlocale/Makefile.fpc
U    packages/unzip/Makefile.fpc
U    packages/postgres/Makefile.fpc
U    packages/fcl-fpcunit/Makefile.fpc
U    packages/fcl-process/Makefile.fpc
U    packages/fcl-image/Makefile.fpc
U    packages/os2units/Makefile.fpc
U    packages/libxml/Makefile.fpc
U    packages/fcl-stl/Makefile.fpc
   C packages/libenet
U    packages/libpng/Makefile.fpc
U    packages/gdbm/Makefile.fpc
U    packages/gtk2/Makefile.fpc
U    packages/fcl-web/Makefile.fpc
U    packages/pcap/Makefile.fpc
U    packages/httpd24/Makefile.fpc
U    packages/fuse/Makefile.fpc
U    packages/amunits/Makefile.fpc
U    packages/bzip2/Makefile.fpc
U    packages/bfd/Makefile.fpc
U    packages/libvlc/Makefile.fpc
U    packages/rtl-extra/Makefile.fpc
U    packages/rexx/Makefile.fpc
U    packages/mad/Makefile.fpc
U    packages/libgd/Makefile.fpc
U    packages/httpd22/Makefile.fpc
U    packages/oggvorbis/Makefile.fpc
U    packages/fcl-async/Makefile.fpc
U    packages/opengl/Makefile.fpc
U    packages/pasjpeg/Makefile.fpc
U    packages/morphunits/Makefile.fpc
U    packages/fcl-extra/Makefile.fpc
U    packages/objcrtl/Makefile.fpc
U    packages/syslog/Makefile.fpc
U    packages/httpd20/Makefile.fpc
U    packages/zlib/Makefile.fpc
U    packages/dblib/Makefile.fpc
U    packages/ibase/Makefile.fpc
U    packages/winunits-base/Makefile.fpc
U    packages/mysql/Makefile.fpc
U    packages/matroska/Makefile.fpc
U    packages/Makefile.fpc
U    packages/winunits-jedi/Makefile.fpc
U    packages/fpindexer/Makefile.fpc
U    packages/univint/Makefile.fpc
U    packages/libc/Makefile.fpc
U    packages/symbolic/Makefile.fpc
U    packages/gnome1/Makefile.fpc
U    packages/sqlite/Makefile.fpc
U    packages/jni/Makefile.fpc
U    packages/sdl/Makefile.fpc
U    packages/winceunits/Makefile.fpc
U    packages/libtar/Makefile.fpc
U    packages/opengles/Makefile.fpc
U    packages/fcl-base/Makefile.fpc
U    packages/fcl-xml/Makefile.fpc
U    packages/aspell/Makefile.fpc
U    packages/a52/Makefile.fpc
U    packages/fftw/Makefile.fpc
U    packages/fcl-json/Makefile.fpc
U    packages/ptc/Makefile.fpc
U    packages/rtl-console/Makefile.fpc
U    packages/ggi/Makefile.fpc
U    packages/fv/Makefile.fpc
U    packages/opencl/Makefile.fpc
U    packages/fastcgi/Makefile.fpc
U    packages/gmp/Makefile.fpc
U    packages/uuid/Makefile.fpc
U    packages/pthreads/Makefile.fpc
U    packages/unixutil/Makefile.fpc
U    packages/fcl-passrc/Makefile.fpc
U    packages/iconvenc/Makefile.fpc
U    packages/fcl-registry/Makefile.fpc
U    packages/newt/Makefile.fpc
U    packages/sndfile/Makefile.fpc
U    packages/openal/Makefile.fpc
U    packages/pastojs/Makefile.fpc
U    packages/oracle/Makefile.fpc
U    packages/libgbafpc/Makefile.fpc
U    packages/pxlib/Makefile.fpc
U    packages/dts/Makefile.fpc
U    packages/libsee/Makefile.fpc
U    packages/librsvg/Makefile.fpc
U    packages/palmunits/Makefile.fpc
U    packages/hermes/Makefile.fpc
U    packages/xforms/Makefile.fpc
U    packages/tcl/Makefile.fpc
U    packages/cocoaint/Makefile.fpc
U    packages/modplug/Makefile.fpc
U    packages/fcl-js/Makefile.fpc
U    packages/arosunits/Makefile.fpc
U    packages/users/Makefile.fpc
U    packages/gdbint/Makefile.fpc
U    packages/fpgtk/Makefile.fpc
U    packages/lua/Makefile.fpc
U    packages/fcl-db/Makefile.fpc
U    packages/cairo/Makefile.fpc
U    packages/fcl-sound/Makefile.fpc
U    packages/svgalib/Makefile.fpc
U    utils/fpcmkcfg/Makefile.fpc
U    utils/fpcm/Makefile.fpc
U    utils/tply/Makefile.fpc
U    utils/fppkg/Makefile.fpc
U    utils/h2pas/Makefile.fpc
U    utils/fpcreslipo/Makefile.fpc
U    ide/Makefile.fpc
U    utils/fpcres/Makefile.fpc
U    utils/Makefile.fpc
U    utils/fpmc/Makefile.fpc
U    utils/rmwait/Makefile.fpc
U    utils/importtl/Makefile.fpc
U    utils/pas2js/Makefile.fpc
U    utils/dxegen/Makefile.fpc
U    utils/debugsvr/Makefile.fpc
U    utils/fpcm/Makefile.fpmake.bs.template
U    utils/fpdoc/Makefile.fpc
U    utils/fprcp/Makefile.fpc
U    utils/unicode/Makefile.fpc
U    utils/pas2fpm/Makefile.fpc
U    utils/fpcm/Makefile.fpmake.template
U    utils/mksymbian/Makefile.fpc
U    utils/instantfpc/Makefile.fpc
U    utils/pas2ut/Makefile.fpc
U    utils/pas2jni/Makefile.fpc
--- Recording mergeinfo for merge of r31317 into '.':
 U   .
Summary of conflicts:
  Tree conflicts: 2
Resolved conflicted state of 'packages/googleapi'
Resolved conflicted state of 'packages/libenet'
Summary of conflicts:
  Tree conflicts: 0 remaining (and 2 already resolved)

# revisions: 31317

git-svn-id: branches/fixes_3_0@31969 -
2015-10-06 21:20:59 +00:00
..
src --- Merging r29407 into '.': 2015-01-13 12:00:00 +00:00
fpmake.pp * makefile regen and version updates. 2015-01-05 15:04:54 +00:00
Makefile * Re-generated makefiles, including examples 2015-08-06 20:26:00 +00:00
Makefile.fpc --- Merging r31317 into '.': 2015-10-06 21:20:59 +00:00
Makefile.fpc.fpcmake * makefile regen and version updates. 2015-01-05 15:04:54 +00:00
README.txt

This package contains additional utility and helper units
which are common to Amiga-like systems. Most utility units
(which are not deprecated) from amunits package should be
moved in here, and get compiled also for AROS and MorphOS.

This package is not for interface units for 3rd party
libraries, because those are mostly system specific, or
contain system specific information (aligment, ABI dependent
function call declarations, etc).