Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

iMSTK
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

9049bb9d

Commit 9049bb9d authored 9 years ago by David Thompson

Downloads
- Plain Diff

Merge branch 'fixErrors' into 'master'

Fix errors

Fix build errors and test crashes (but not test failures).

See merge request !27

parents 251c9c71 d2edd9b0

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/smContactHandling/UnitTests/PenaltyContactHandlingSpec.cpp 21 additions, 21 deletions

...mContactHandling/UnitTests/PenaltyContactHandlingSpec.cpp
src/smCore/CMakeLists.txt 1 addition, 1 deletion

src/smCore/CMakeLists.txt
src/smMesh/smMesh.cpp 5 additions, 1 deletion

src/smMesh/smMesh.cpp
src/smMesh/smVegaSceneObject.cpp 21 additions, 14 deletions

src/smMesh/smVegaSceneObject.cpp
src/smSimulators/smVegaFemSceneObject.cpp 23 additions, 12 deletions

src/smSimulators/smVegaFemSceneObject.cpp

with 71 additions and 49 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment