Changeset 2376 for stable

Timestamp:

Jul 19, 2018 4:04:41 PM (17 months ago)

Author:

tkr

Message:

Merging r2375 from trunk

Location:

stable/2.9

Files:

• . (modified) (1 prop)
• .travis.yml (modified) (1 diff)
• Cbc (modified) (1 prop)
• Cbc/README (modified) (2 diffs)
• INSTALL (modified) (1 diff)
• README.md (modified) (4 diffs)

stable/2.9/.travis.yml

@@ -1 @@
-\language: cpp
+language: cpp
 env:
   global: 

stable/2.9/Cbc/README

@@ -1 @@
-# CBC Version 2.9.4 README
+# CBC Version 2.9.9 README
 
 Welcome to the README for the COIN Branch and Cut Solver (CBC). CBC is
@@ -40 +40 @@
 
 ## CHANGELOG
+
+ * Release 2.9.9
+
+   * Fixes for SOS2
+   * Updates to mipstart
+   * Switching to new build system
+   * Updates for CI
 
  * Release 2.9.8

stable/2.9/INSTALL

@@ -44 +44 @@
 
    cd Cbc-2.9
-   git clone --branch=stable/0.8 https://github.com/coin-or/BuildTools
+   git clone --branch=stable/0.8 https://github.com/coin-or-tools/BuildTools
    BuildTools/get.dependencies fetch
 

stable/2.9/README.md

@@ -1 @@
-# CBC Version 2.9.8 README
+# CBC Version 2.9.9 README
 
 Welcome to the README for the COIN Branch and Cut Solver (CBC). CBC is
@@ -6 +6 @@
 be redistributed freely.
 
-## Current Testing Status
+## CURRENT BUILD STATUS
 
 [![Build Status](https://travis-ci.org/coin-or/Cbc.svg?branch=master)](https://travis-ci.org/coin-or/Cbc)
@@ -17 +17 @@
 
 Binaries for most platforms are available for download from [Bintray](https://bintray.com/coin-or/download/Cbc)
+
+## CITE
+
+[![DOI](https://zenodo.org/badge/30382416.svg)](https://zenodo.org/badge/latestdoi/30382416)
 
 ## DOCUMENTATION
@@ -48 +52 @@
 
 ## CHANGELOG
+
+ * Release 2.9.9
+
+   * Fixes for SOS2
+   * Updates to mipstart
+   * Switching to new build system
+   * Updates for CI
 
  * Release 2.9.8