[freefempp] 01/03: Merge tag 'upstream/3.35' into experimental

[Dimitrios Eftaxiopoulos]

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

eftaxiop-guest pushed a commit to branch experimental
in repository freefempp.

commit 14b00b6ece083c8de8060119a8da41ba17db79aa
Merge: 2641d68 21b4f37
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Thu Mar 12 21:20:56 2015 +0200

    Merge tag 'upstream/3.35' into experimental
    
    Upstream version 3.35
    
    Conflicts:
    	examples++-mpi/._complex_SuperLU_DIST_FreeFem.cpp
    	examples++-mpi/._hips_FreeFem.cpp
    	examples++-mpi/._parms_FreeFem.cpp
    	examples++-mpi/._real_SuperLU_DIST_FreeFem.cpp
    	src/fflib/._array_tlp.hpp~HEAD
    	src/fflib/._ffapi.cpp~upstream_3.34.2

 DOC/Makefile.in                                    |    1 +
 HISTORY                                            | 3948 +++++++++++---------
 INNOVATION                                         |    9 +-
 Makefile.in                                        |    1 +
 README                                             |    4 +-
 configure                                          |   37 +-
 configure.ac                                       |   15 +-
 download/Makefile                                  |    8 +-
 download/Makefile.am                               |    7 +-
 download/arpack/Makefile                           |    1 +
 download/blas/Makefile.in                          |    1 +
 download/fftw/Makefile                             |    1 +
 download/getall                                    |   31 +-
 download/hips/makefile-hips.inc                    |    8 +-
 download/ipopt/Makefile                            |    2 +-
 download/metis/Makefile                            |   35 +-
 download/metis/Makefile-metis.in                   |    1 +
 download/mmg3d/Makefile                            |    2 +-
 download/mumps-seq/Makefile                        |    4 +-
 ...e-mumps-4.10.0.inc => Makefile-mumps-5.0.0.inc} |    4 +-
 download/mumps/MUMPS_4.10.0.patch                  |   31 -
 download/mumps/Makefile                            |    8 +-
 ...e-mumps-4.10.0.inc => Makefile-mumps-5.0.0.inc} |   10 +-
 download/parmetis/Makefile-parmetis.in             |    9 +-
 download/parmetis/makefile                         |   86 +-
 download/pastix/Makefile                           |   23 +-
 download/pastix/config-pastix-complex.in           |    6 +-
 download/pastix/config-pastix-real.in              |    8 +-
 download/pastix/patch-pastix_long_complex.h        |   19 +-
 download/scotch/Makefile                           |   23 +-
 download/scotch/Makefile-scotch.inc                |    2 +-
 download/umfpack/Makefile                          |    3 +-
 download/umfpack/Makefile.am                       |    2 +-
 download/yams/Makefile                             |    2 +-
 examples++-3d/Makefile.in                          |    1 +
 examples++-bug/Makefile.in                         |    1 +
 examples++-chapt3/Makefile.in                      |    1 +
 examples++-eigen/Makefile.in                       |    1 +
 examples++-load/Element_Mixte.cpp                  |  397 +-
 examples++-load/LapMUMPS_seq.edp                   |    2 +-
 examples++-load/Makefile.in                        |    1 +
 examples++-load/ff-get-dep.awk                     |   40 +-
 examples++-load/metis.cpp                          |    2 +-
 examples++-mpi/._complex_pastix_FreeFem.cpp        |  Bin 167 -> 0 bytes
 .../._hips_FreeFem.cpp                             |  Bin
 .../._hips_FreeFem.cpp.orig                        |  Bin
 .../._parms_FreeFem.cpp                            |  Bin
 .../._parms_FreeFem.cpp.orig                       |  Bin
 examples++-mpi/Heat3d.idp                          |    2 +-
 examples++-mpi/MUMPS.cpp                           |    2 +-
 examples++-mpi/MUMPS_FreeFem.cpp                   |    2 +-
 examples++-mpi/Makefile.in                         |    1 +
 examples++-mpi/Stokes-v1-matrix-superludist.edp    |    2 +-
 examples++-mpi/complex_SuperLU_DIST_FreeFem.cpp    |    2 +-
 examples++-mpi/complex_pastix_FreeFem.cpp          |    2 +-
 examples++-mpi/hips_FreeFem.cpp                    |    9 +-
 examples++-mpi/parms_FreeFem.cpp                   |    9 +-
 examples++-mpi/real_SuperLU_DIST_FreeFem.cpp       |    2 +-
 examples++-mpi/schwarz.cpp                         |    2 +-
 examples++-other/Makefile.in                       |    1 +
 examples++-tutorial/Makefile.in                    |    1 +
 examples++/Makefile.in                             |    1 +
 src/Algo/Makefile.in                               |    1 +
 src/Graphics/Makefile.in                           |    1 +
 src/Makefile.in                                    |    1 +
 src/bamg/Makefile.in                               |    1 +
 src/bamglib/Makefile.in                            |    1 +
 src/bin-win32/Makefile.in                          |    1 +
 src/femlib/Makefile.in                             |    1 +
 src/fflib/Makefile.in                              |    1 +
 src/fflib/strversionnumber.cpp                     |    4 +-
 src/lglib/Makefile.in                              |    1 +
 src/libMesh/Makefile.in                            |    1 +
 src/medit/Makefile.in                              |    1 +
 src/mpi/Makefile.in                                |    1 +
 src/mpi/ff-mpirun.in                               |    8 +-
 src/nw/Makefile.in                                 |    1 +
 77 files changed, 2830 insertions(+), 2031 deletions(-)

diff --cc examples++-mpi/._hips_FreeFem.cpp.orig
index 14f037e,14f037e..14f037e
Binary files differ
diff --cc examples++-mpi/._parms_FreeFem.cpp.orig
index 14f037e,14f037e..14f037e
Binary files differ

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