Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

openfpm_io
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

91875fbb

Commit 91875fbb authored 3 years ago by Pietro Incardona

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 8315de35 1e1eb139

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 17 additions, 3 deletions

CMakeLists.txt
build.sh 0 additions, 1 deletion

build.sh
configure 19 additions, 0 deletions

configure
src/CMakeLists.txt 32 additions, 3 deletions

src/CMakeLists.txt
src/RawReader/InitGridWithPixel.hpp 1 addition, 1 deletion

src/RawReader/InitGridWithPixel.hpp
src/config/config_cmake.h.in 6 additions, 0 deletions

src/config/config_cmake.h.in
src/main.cpp 0 additions, 1 deletion

src/main.cpp

with 75 additions and 9 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