Merge remote-tracking branch 'upstream/master' into PR/flag-to-ignore-solverconv

This commit is contained in:
Robert Kloefkorn 2016-05-27 12:56:20 +02:00
commit 93386b44ed
4 changed files with 4 additions and 4 deletions

View File

@ -57,7 +57,7 @@
#include <iostream>
#include <vector>
#include <numeric>
#include <fstream>
namespace
{

View File

@ -57,7 +57,7 @@
#include <iostream>
#include <vector>
#include <numeric>
#include <fstream>
namespace
{

View File

@ -57,7 +57,7 @@
#include <iostream>
#include <vector>
#include <numeric>
#include <fstream>
namespace
{

View File

@ -78,7 +78,7 @@
#include <iostream>
#include <vector>
#include <numeric>
#include <fstream>
namespace
{