Skip to content
Snippets Groups Projects
Commit 717855e4 authored by niikonst's avatar niikonst
Browse files

Merge commit 'f5c5f586' into develop 

Conflicts:
	src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
parents 1117987d f5c5f586
2 merge requests!298[CPU] Clean CPU core,!297rename getDistributionInvForDirection to getPostCollisionDistributionForDirection
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment