[clp] 01/03: Merge tag 'upstream/1.15.10'

[Miles Lubin]

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

mlubin-guest pushed a commit to branch master
in repository clp.

commit e1dccf3fd23f35a6708a31c59bfe2b4930d93082
Merge: c440a19 68acd23
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Wed Sep 3 16:49:51 2014 -0400

    Merge tag 'upstream/1.15.10'
    
    Upstream version 1.15.10

 Makefile.am                          |   7 +-
 Makefile.in                          |  21 ++--
 configure                            | 158 ++++++++++-------------------
 configure.ac                         |   6 +-
 src/AbcSimplex.cpp                   |  21 ++--
 src/AbcSimplexPrimal.cpp             |  34 ++++++-
 src/CbcOrClpParam.cpp                |   7 +-
 src/ClpMain.cpp                      |   2 +-
 src/ClpModel.cpp                     |  55 +++++++++--
 src/ClpModel.hpp                     |   4 +-
 src/ClpParameters.hpp                |   6 +-
 src/ClpPredictorCorrector.cpp        |  30 +++++-
 src/ClpSimplex.hpp                   |   4 +-
 src/ClpSimplexDual.cpp               |   8 +-
 src/ClpSimplexOther.cpp              |   6 +-
 src/ClpSimplexPrimal.cpp             |  14 ++-
 src/ClpSolve.cpp                     |  20 +++-
 src/Clp_C_Interface.cpp              |  29 +++++-
 src/Clp_C_Interface.h                |  36 ++++++-
 src/CoinAbcBaseFactorization1.cpp    |  17 +++-
 src/Idiot.cpp                        |   4 +-
 src/Makefile.am                      |  11 ++-
 src/Makefile.in                      | 186 ++++++++---------------------------
 src/OsiClp/Makefile.am               |   5 +
 src/OsiClp/Makefile.in               |   7 +-
 src/OsiClp/OsiClpSolverInterface.cpp |  15 ++-
 src/config_clp_default.h             |   4 +-
 27 files changed, 389 insertions(+), 328 deletions(-)

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