[gmsh] 01/04: Merge.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gmsh.

commit 425c2165f168861c5cbe25e46eafcd74a158d86e
Merge: 7ebf27d 5ea8a90
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Aug 21 19:40:38 2016 +0200

    Merge.

 CMakeLists.txt                                     |   2 +-
 Common/Context.cpp                                 |   2 +-
 Common/DefaultOptions.h                            |   4 +-
 Common/Gmsh.cpp                                    |  15 +-
 Common/GmshMessage.cpp                             |   3 +-
 Common/GmshMessage.h                               |   4 +-
 Common/Options.cpp                                 |  26 +-
 Common/Options.h                                   |   6 +-
 Common/gmshLocalNetworkClient.cpp                  |  32 +-
 Fltk/onelabGroup.cpp                               |  13 +-
 Fltk/openglWindow.cpp                              |   4 +-
 Fltk/optionWindow.cpp                              |  10 +-
 Geo/Cell.cpp                                       |   2 +-
 Geo/Cell.h                                         |   2 +-
 Geo/CellComplex.cpp                                |   2 +-
 Geo/CellComplex.h                                  |   2 +-
 Geo/Chain.cpp                                      |   2 +-
 Geo/Chain.h                                        |   2 +-
 Geo/ChainComplex.cpp                               |   2 +-
 Geo/ChainComplex.h                                 |   2 +-
 Geo/GModel.cpp                                     |  33 +-
 Geo/GModel.h                                       |   4 +-
 Geo/GModelIO_MSH.cpp                               |  63 +--
 Geo/GModelIO_MSH2.cpp                              |   8 +-
 Geo/GModelVertexArrays.cpp                         |   5 +-
 Geo/Homology.cpp                                   |   2 +-
 Geo/Homology.h                                     |   2 +-
 Geo/MQuadrangle.cpp                                |  12 +-
 Geo/MTriangle.cpp                                  |  16 +-
 Geo/discreteDiskFace.cpp                           | 370 +++++++++++++++---
 Geo/discreteDiskFace.h                             |  49 ++-
 Geo/discreteFace.cpp                               | 430 ++++++++++++++++++---
 Geo/discreteFace.h                                 |   7 +
 Graphics/drawContext.cpp                           |   2 +-
 Graphics/drawMesh.cpp                              |  11 +-
 Graphics/drawPost.cpp                              |  14 +-
 Graphics/drawScales.cpp                            |  63 ++-
 Mesh/HighOrder.cpp                                 |   4 +-
 Mesh/meshGFace.cpp                                 |   5 +-
 Mesh/yamakawa.cpp                                  |   4 +-
 Parser/Gmsh.y                                      |  17 +-
 Post/PView.h                                       |   2 +-
 Post/PViewDataGModelIO.cpp                         |   4 +-
 Post/PViewIO.cpp                                   |   6 +-
 Post/PViewVertexArrays.cpp                         |  16 +-
 Solver/linearSystemPETSc.hpp                       |   2 +-
 contrib/HighOrderMeshOptimizer/OptHomMesh.cpp      |   6 +-
 contrib/HighOrderMeshOptimizer/OptHomRun.cpp       |  12 +-
 contrib/MeshOptimizer/MeshOptimizer.cpp            |   5 +-
 contrib/MeshOptimizer/MeshOptimizer.h              |   4 +-
 .../MeshQualityOptimizer/MeshQualityOptimizer.cpp  |  13 +-
 .../MeshQualityOptimizer/MeshQualityOptimizer.h    |   5 +-
 .../Android/src/org/geuz/onelab/AboutActivity.java |  21 +-
 doc/VERSIONS.txt                                   |   3 +
 doc/texinfo/cmake_options.texi                     |   4 +-
 doc/texinfo/opt_mesh.texi                          |   2 +-
 doc/texinfo/opt_plugin.texi                        |  99 ++---
 doc/texinfo/opt_print.texi                         |  20 +
 doc/texinfo/opt_solver.texi                        |   2 +-
 doc/texinfo/opt_view.texi                          |   2 +-
 60 files changed, 1134 insertions(+), 352 deletions(-)

diff --cc Common/Gmsh.cpp
index 3be622a,62e960c..97172d6
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@@ -161,11 -163,10 +163,12 @@@ int GmshGetOption(const std::string &ca
  int GmshGetOption(const std::string &category, const std::string &name,
                    unsigned int &value, int index)
  {
-   return ColorOption(GMSH_GET, category.c_str(), index, name.c_str(), value);
+   return ColorOption(GMSH_GET, category.c_str(), index, name.c_str(), value,
+                      false);
  }
  
 +<<<<<<< HEAD
 +=======
  std::string GmshGetStringOption(const std::string &category, const std::string &name,
                                  int index)
  {

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