[freefempp] 01/02: Merge tag 'upstream/3.36.1' 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 bc4b90272d888702bf051b1bc2a07fb9af300a46
Merge: 7d1a244 5cd86f8
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Mon Apr 13 21:49:59 2015 +0300

    Merge tag 'upstream/3.36.1' into experimental
    
    Upstream version 3.36.1
    
    Conflicts:
    	Makefile.in
    	configure
    	examples++-load/Makefile.in
    	examples++-tutorial/Makefile.in
    	src/fflib/strversionnumber.cpp

 HISTORY                                      |    92 +-
 INNOVATION                                   |     1 +
 Makefile.am                                  |    38 +-
 Makefile.in                                  |  1246 ++
 configure                                    | 20888 +++++++++++++++++++++++++
 configure.ac                                 |     2 +-
 download/Makefile                            |     2 +-
 download/Makefile.am                         |     2 +-
 download/parmetis/makefile                   |     8 +-
 download/parmetis/parmetis-4.0.3.patch       |     2 +-
 download/scotch/Makefile                     |     4 +-
 download/scotch/Makefile-scotch.inc          |     8 +-
 download/scotch/scotch_5.1_esmumps.patch     |   217 -
 download/scotch/scotch_6.0.3.patch           |    11 +
 examples++-3d/Period-Poisson-cube-ballon.edp |     4 +-
 examples++-3d/sphere6.edp                    |     2 +-
 examples++-load/Makefile.am                  |     6 +-
 examples++-load/Makefile.in                  |  1844 +++
 examples++-load/exactpartition.cpp           |   119 +
 examples++-load/exactpartition.edp           |    30 +
 examples++-load/include.tar.gz               |   Bin 2316 -> 1906 bytes
 examples++-load/load.link.in                 |     2 +-
 examples++-load/msh3.cpp                     |     6 +-
 examples++-mpi/DDM-Schwarz-macro.idp         |    44 +-
 examples++-mpi/PETSc.hpp                     |   185 +-
 examples++-mpi/schwarz.cpp                   |     5 +-
 examples++-tutorial/FE.edp                   |     2 +
 examples++-tutorial/Makefile.am              |     2 +-
 examples++-tutorial/Makefile.in              |  1424 ++
 examples++-tutorial/mesh-internal.edp        |    47 +
 src/femlib/BamgFreeFem.cpp                   |    71 +-
 src/femlib/BamgFreeFem.hpp                   |     2 +-
 src/femlib/fem.cpp                           |     8 +-
 src/fflib/AFunction.cpp                      |    45 +-
 src/fflib/array_long.cpp                     |     1 +
 src/fflib/array_real.cpp                     |     1 +
 src/fflib/array_tlp.hpp                      |     8 +-
 src/fflib/lgfem.cpp                          |    21 +-
 src/fflib/lgmesh.cpp                         |    14 +-
 src/fflib/lgmesh3.cpp                        |     3 +-
 src/fflib/strversionnumber.cpp               |     4 +-
 41 files changed, 25986 insertions(+), 435 deletions(-)


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