Merge branch 'master' into 'BuildPythonWindows'

# Conflicts:
#   src/Python/Vector.hh
This commit is contained in:
Alexander Dielen
2016-09-16 12:54:51 +02:00
22 changed files with 365 additions and 84 deletions

View File

@@ -190,4 +190,4 @@ void expose_vec(const char *_name) {
} // namespace OpenMesh
} // namespace Python
#endif
#endif