Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

5eaa0c1f

Commit 5eaa0c1f authored 12 years ago by Tom Fischer

Downloads
- Plain Diff

Merge branch 'master' into Mesh2MeshPropertyInterpolation

parents 4b385793 cefc2183

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 2 additions, 2 deletions

.travis.yml
BaseLib/FileTools.cpp 64 additions, 39 deletions

BaseLib/FileTools.cpp
BaseLib/FileTools.h 27 additions, 9 deletions

BaseLib/FileTools.h
BaseLib/StringTools.cpp 10 additions, 0 deletions

BaseLib/StringTools.cpp
BaseLib/StringTools.h 7 additions, 0 deletions

BaseLib/StringTools.h
FileIO/GMSInterface.cpp 1 addition, 1 deletion

FileIO/GMSInterface.cpp
FileIO/Legacy/MeshIO.cpp 1 addition, 1 deletion

FileIO/Legacy/MeshIO.cpp
FileIO/Legacy/OGSIOVer4.cpp 3 additions, 5 deletions

FileIO/Legacy/OGSIOVer4.cpp
FileIO/MeshIO/GMSHInterface.cpp 1 addition, 1 deletion

FileIO/MeshIO/GMSHInterface.cpp
FileIO/RapidXmlIO/RapidVtuInterface.cpp 1 addition, 1 deletion

FileIO/RapidXmlIO/RapidVtuInterface.cpp
FileIO/readMeshFromFile.cpp 9 additions, 10 deletions

FileIO/readMeshFromFile.cpp
SimpleTests/MeshTests/MeshRead.cpp 2 additions, 9 deletions

SimpleTests/MeshTests/MeshRead.cpp
Tests/BaseLib/TestFilePathStringManipulation.cpp 329 additions, 0 deletions

Tests/BaseLib/TestFilePathStringManipulation.cpp
Utils/FileConverter/generateMatPropsFromMatID.cpp 1 addition, 1 deletion

Utils/FileConverter/generateMatPropsFromMatID.cpp

with 458 additions and 79 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