[coinutils] 01/02: Merge tag 'upstream/2.9.10'

Miles Lubin mlubin-guest at moszumanska.debian.org
Thu Nov 28 02:52:52 UTC 2013


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

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

commit db779e7e8b075f68868c06ec74955ee439f55923
Merge: 2847631 ce63b1d
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Wed Nov 27 21:40:14 2013 -0500

    Merge tag 'upstream/2.9.10'
    
    Upstream version 2.9.10
    
    Seems like a rebase unlinked the master and upstream branches

 BuildTools/MSVisualStudio/v10/Common.props         |   5 +-
 BuildTools/coin.m4                                 | 319 +++----
 BuildTools/prepare_new_release                     |  25 +-
 BuildTools/prepare_new_stable                      |  26 +-
 .../unitTestCoinUtils/unitTestCoinUtils.vcxproj    |   9 +-
 CoinUtils/Makefile.in                              |   2 +
 CoinUtils/configure                                | 955 ++++++++++++---------
 CoinUtils/configure.ac                             |  11 +-
 CoinUtils/src/CoinHelperFunctions.hpp              |   7 +-
 CoinUtils/src/CoinLpIO.cpp                         |  14 +-
 CoinUtils/src/CoinLpIO.hpp                         |   9 +-
 CoinUtils/src/CoinMpsIO.cpp                        | 155 +++-
 CoinUtils/src/CoinMpsIO.hpp                        |  14 +-
 CoinUtils/src/CoinTypes.hpp                        |   5 +-
 CoinUtils/src/Makefile.in                          |   2 +
 CoinUtils/src/config.h.in                          |   6 +
 CoinUtils/src/config_coinutils.h.in                |   3 +
 CoinUtils/src/config_coinutils_default.h           |   4 +-
 CoinUtils/test/CoinMpsIOTest.cpp                   | 100 +++
 CoinUtils/test/Makefile.in                         |   2 +
 Data/Sample/configure                              | 152 ++--
 Data/Sample/configure.ac                           |   7 +-
 Data/Sample/conic.mps                              |  52 ++
 Data/Sample/lseu.mps                               | 371 ++++++++
 Data/Sample/spec_sections.mps                      |  63 ++
 Makefile.in                                        |   2 +
 configure                                          | 589 +++++--------
 configure.ac                                       |   4 +-
 28 files changed, 1773 insertions(+), 1140 deletions(-)

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



More information about the debian-science-commits mailing list