CMakeLists.txt · ab8b5dfc5822f10db4673624808257446c3fa89f · iRMB / VirtualFluids

Apr 30, 2019
abebc322
Merge remote-tracking branch 'origin/development/TrafficAnna' into development/Martin · abebc322
Martin Schönherr authored Apr 30, 2019
```
# Conflicts:
#	src/VirtualFluids_GPU/LBM/Simulation.cpp
#	targets/apps/LBM/Basel/main.cpp
```
abebc322
Merge remote-tracking branch 'origin/development/TrafficAnna' into development/Martin
Martin Schönherr authored Apr 30, 2019
```
# Conflicts:
#	src/VirtualFluids_GPU/LBM/Simulation.cpp
#	targets/apps/LBM/Basel/main.cpp
```