Merge branch 'master' into v2beta

Conflicts: CI/ci-mac.sh VERSION src/Unittests/unittests_files.cc

Merge branch 'master' into v2beta
Conflicts: CI/ci-mac.sh VERSION src/Unittests/unittests_files.cc
3d2e59b8 · Max Lyon · cc84b82c · b5b9aad9 · 3d2e59b8 · 3d2e59b8
Commit 3d2e59b8 authored May 11, 2016 by Max Lyon
--- a/CI/ci-mac.sh
+++ b/CI/ci-mac.sh
@@ -48,7 +48,6 @@ cd Unittests
 cd ..
 cd ..

-
 #########################################
 # Build Debug version and Unittests
 #########################################
@@ -67,7 +66,6 @@ make
 #build the unit tests
 make unittests

-
 #########################################
 # Run Debug Unittests
 #########################################

--- a/src/Unittests/unittests_files.cc
+++ b/src/Unittests/unittests_files.cc
@@ -4,6 +4,7 @@
 #include <OpenVolumeMesh/FileManager/FileManager.hh>

 using namespace OpenVolumeMesh;
+
 using namespace Geometry;

 TEST_F(PolyhedralMeshBase, LoadFile) {