Skip to content
Snippets Groups Projects
Commit 1d7425de authored by Konstantin Kutscher's avatar Konstantin Kutscher
Browse files

Merge branch 'dem_coupling' of... 

Merge branch 'dem_coupling' of http://elladan.irmb.bau.tu-bs.de/hulc/VirtualFluids into dem_coupling

# Conflicts:
#	source/Applications/pChannel/configBombadilpChannel.cfg
parents 4c2740ec 1f5f760e
No related branches found
No related tags found
No related merge requests found
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