[mpfi] 02/39: Merge commit 'upstream/1.4'

[Jerome Benoit]

This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository mpfi.

commit 4ca57ee285e8ae686305d87615bf165226a29f41
Merge: b68477d 52dd785
Author: Laurent Fousse <laurent at komite.net>
Date:   Wed Jun 23 21:49:19 2010 +0200

    Merge commit 'upstream/1.4'
    
    Conflicts:
    	doc/mpfi.info

 AUTHORS            |   3 +
 COPYING            |   4 +-
 ChangeLog          | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS               |  16 ++-
 README             |   3 -
 configure          |   2 +-
 configure.ac       |   2 +-
 depcomp            |   5 +-
 doc/mpfi.info      |  89 +++++++-------
 doc/mpfi.texi      |  25 ++--
 missing            |   5 +-
 mkinstalldirs      |   2 +-
 src/mpfi-impl.h    |   4 +-
 src/mpfi.c         |   4 +-
 src/mpfi.h         |   4 +-
 src/mpfi_io.c      |   4 +-
 src/mpfi_io.h      |   4 +-
 src/mpfi_trigo.c   |   4 +-
 tests/test_mpfi.c  |   4 +-
 tests/test_trigo.c |   4 +-
 20 files changed, 457 insertions(+), 85 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mpfi.git