[freefempp] 01/05: Merge tag 'upstream/3.37.1'

[Dimitrios Eftaxiopoulos]

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

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

commit e97075ae813cf78dc0407881fdee3831831b5785
Merge: 3a40460 2dc34aa
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Mon Jun 1 10:43:23 2015 +0300

    Merge tag 'upstream/3.37.1'
    
    Upstream version 3.37.1
    
    Conflicts:
    	configure
    	download/Makefile.in
    	examples++-mpi/Makefile.in
    	src/fflib/strversionnumber.cpp

 HISTORY                              |    32 +-
 INNOVATION                           |     4 +
 configure                            | 20888 +++++++++++++++++++++++++++++++++
 configure.ac                         |     2 +-
 download/Makefile.am                 |     5 +-
 download/Makefile.in                 |   963 ++
 download/patch-hpddm-1               |    29 +
 examples++-load/ClosePoints.edp      |     2 +-
 examples++-mpi/Makefile.am           |     4 +-
 examples++-mpi/Makefile.in           |  1287 ++
 examples++-mpi/additional.idp        |    36 +-
 examples++-mpi/schwarz-add-macro.idp |     5 +-
 examples++-mpi/schwarz-init.hpp      |    62 +
 examples++-mpi/schwarz-macro.idp     |     8 +-
 examples++-mpi/schwarz.cpp           |   170 +-
 examples++-mpi/schwarz.edp           |     6 +-
 examples++-mpi/stokes-2d.edp         |     4 +-
 examples++-tutorial/array.edp        |    14 +-
 src/fflib/Operator.hpp               |    24 +
 src/fflib/array_tlp.hpp              |     5 +-
 src/fflib/lgsolver.hpp               |     5 +-
 src/fflib/strversionnumber.cpp       |     5 +
 22 files changed, 23434 insertions(+), 126 deletions(-)

diff --cc src/fflib/strversionnumber.cpp
index 46232bd,5300a92..0b39b4a
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@@ -18,6 -18,6 +18,11 @@@ string StrVersionNumber()
  //  buffer.precision(8);
  //  buffer<<VersionNumber();
    static char buffer[100];
++<<<<<<< HEAD
 +  sprintf(buffer," %9f (date Κυρ 17 Μάι 2015 11:51:20 πμ EEST)",VersionNumber());
 +  return buffer; //.str()+" (date Κυρ 17 Μάι 2015 11:51:20 πμ EEST)" ;
++=======
+   sprintf(buffer," %9f (date Ven 22 mai 2015 13:48:50 CEST)",VersionNumber());
+   return buffer; //.str()+" (date Ven 22 mai 2015 13:48:50 CEST)" ;
++>>>>>>> upstream/3.37.1
  }

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