[coinor-cbc] 01/03: Merge tag 'upstream/2.8.12'
Miles Lubin
mlubin-guest at moszumanska.debian.org
Thu Sep 4 01:35:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
mlubin-guest pushed a commit to branch master
in repository coinor-cbc.
commit 8ecb0272c3fb7eff891197454b8f4e7af170bea5
Merge: 570c38c 4a6551e
Author: Miles Lubin <miles.lubin at gmail.com>
Date: Wed Sep 3 18:13:55 2014 -0400
Merge tag 'upstream/2.8.12'
Upstream version 2.8.12
.../CbcWithInstalledLibraries/BaseCBCProject.sln | 20 +
.../BaseCBCProject.vcxproj | 88 +
.../v10/CbcWithInstalledLibraries/README.txt | 12 +
.../v10/CbcWithInstalledLibraries/main.cpp | 37 +
Makefile.am | 7 +-
Makefile.in | 8 +-
configure | 143 +-
configure.ac | 6 +-
examples/parallel.cpp | 235 +++
examples/parallel2.cpp | 196 ++
src/CbcBranchLotsize.cpp | 18 +-
src/CbcEventHandler.hpp | 6 +-
src/CbcHeuristic.cpp | 6 +-
src/CbcMipStartIO.cpp | 69 +-
src/CbcModel.cpp | 127 +-
src/CbcModel.hpp | 6 +-
src/CbcNode.cpp | 13 +-
src/CbcSOS.cpp | 30 +-
src/CbcSolver.cpp | 254 ++-
src/CbcSolver.hpp | 64 +-
src/CbcThread.hpp | 10 +-
src/CbcTree.cpp | 63 +-
src/Cbc_C_Interface.cpp | 2064 +++-----------------
src/Cbc_C_Interface.h | 642 ++----
src/Cbc_ampl.cpp | 20 +-
src/Makefile.am | 14 +-
src/Makefile.in | 209 +-
src/OsiCbc/Makefile.am | 7 +-
src/OsiCbc/Makefile.in | 7 +-
src/config_cbc_default.h | 4 +-
src/unitTestClp.cpp | 4 +-
test/CInterfaceTest.c | 381 ++++
test/Makefile.am | 20 +-
test/Makefile.in | 63 +-
34 files changed, 2179 insertions(+), 2674 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coinor-cbc.git
More information about the debian-science-commits
mailing list