[coinor-osi] 07/15: Merge branch 'upstream' into experimental

[Anton Gladky]

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

gladk pushed a commit to branch experimental
in repository coinor-osi.

commit 01b6b46d63e0925e16c31a11c2982cfc2533a5b0
Merge: 8c478d6 a42d329
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Jun 3 21:13:02 2017 +0200

    Merge branch 'upstream' into experimental

 CHANGELOG                                          |  10 +
 MSVisualStudio/v10/Osi.sln                         |  89 -----
 .../v10/OsiExamplesBasic/OsiExamplesBasic.vcxproj  | 116 ------
 .../v10/OsiExamplesBuild/OsiExamplesBuild.vcxproj  | 115 ------
 .../OsiExamplesParameters.vcxproj                  | 115 ------
 .../v10/OsiExamplesQuery/OsiExamplesQuery.vcxproj  | 116 ------
 .../OsiExamplesSpecific.vcxproj                    | 115 ------
 MSVisualStudio/v10/OsiUnitTest/OsiUnitTest.vcxproj | 201 ----------
 MSVisualStudio/v10/libOsi/libOsi.vcxproj           | 191 ---------
 .../v10/libOsiCommonTest/libOsiCommonTest.vcxproj  | 167 --------
 MSVisualStudio/v9/Osi.sln                          | 127 ------
 .../v9/OsiExamplesBasic/OsiExamplesBasic.vcproj    | 196 ----------
 .../v9/OsiExamplesBuild/OsiExamplesBuild.vcproj    | 195 ----------
 .../OsiExamplesParameters.vcproj                   | 195 ----------
 .../v9/OsiExamplesQuery/OsiExamplesQuery.vcproj    | 196 ----------
 .../OsiExamplesSpecific/OsiExamplesSpecific.vcproj | 195 ----------
 MSVisualStudio/v9/OsiUnitTest/OsiUnitTest.vcproj   | 358 -----------------
 MSVisualStudio/v9/libOsi/libOsi.vcproj             | 431 ---------------------
 .../v9/libOsiCommonTest/libOsiCommonTest.vcproj    | 331 ----------------
 Makefile.am                                        |   4 +-
 Makefile.in                                        | 103 ++++-
 configure                                          | 258 ++++++++----
 configure.ac                                       |   6 +-
 src/Osi/Makefile.am                                |   2 +-
 src/Osi/Makefile.in                                |   5 +
 src/Osi/OsiCuts.hpp                                |   2 +-
 src/Osi/OsiPresolve.cpp                            |  13 +-
 src/Osi/OsiSolverInterface.cpp                     | 107 +++++
 src/Osi/OsiSolverInterface.hpp                     |   7 +
 src/Osi/config_osi_default.h                       |   6 +-
 src/OsiCommonTest/Makefile.am                      |   2 +-
 src/OsiCommonTest/Makefile.in                      |   5 +
 src/OsiCpx/Makefile.in                             |   5 +
 src/OsiCpx/OsiCpxSolverInterface.cpp               |  39 +-
 src/OsiCpx/OsiCpxSolverInterface.hpp               |  11 +-
 src/OsiGlpk/Makefile.am                            |   2 +-
 src/OsiGlpk/Makefile.in                            |   5 +
 src/OsiGrb/Makefile.in                             |   5 +
 src/OsiGrb/OsiGrbSolverInterface.cpp               |   2 +-
 src/OsiMsk/Makefile.in                             |   5 +
 src/OsiSpx/Makefile.in                             |   5 +
 src/OsiSpx/OsiSpxSolverInterface.cpp               |  29 +-
 src/OsiSpx/OsiSpxSolverInterface.hpp               |  61 +--
 src/OsiXpr/Makefile.in                             |   5 +
 test/Makefile.in                                   |   5 +
 test/OsiSpxSolverInterfaceTest.cpp                 |   2 +-
 test/unitTest.cpp                                  |   2 +-
 47 files changed, 576 insertions(+), 3586 deletions(-)

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