Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openfpm_numerics
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

dd0e4d4d

Commit dd0e4d4d authored 8 years ago by Pietro Incardona

Downloads
- Plain Diff

Fixing conflict

parents c0aef3fd 6794c24b

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile.am 1 addition, 1 deletion

src/Makefile.am
src/Matrix/SparseMatrix_Eigen.hpp 1 addition, 1 deletion

src/Matrix/SparseMatrix_Eigen.hpp
src/Operators/Vector/vector_dist_operators_apply_kernel.hpp 1 addition, 1 deletion

src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
src/Operators/Vector/vector_dist_operators_functions.hpp 9 additions, 6 deletions

src/Operators/Vector/vector_dist_operators_functions.hpp
src/Operators/Vector/vector_dist_operators_unit_tests.hpp 2 additions, 2 deletions

src/Operators/Vector/vector_dist_operators_unit_tests.hpp
src/unit_test_init_cleanup.hpp 1 addition, 1 deletion

src/unit_test_init_cleanup.hpp

with 15 additions and 12 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