Skip to content
Snippets Groups Projects
Commit a9bf1036 authored by Richard Angersbach's avatar Richard Angersbach
Browse files

Merge branch 'master' into test/waLBerla_refined_comm

# Conflicts:
#	Compiler/src/exastencils/baseExt/ir/IR_ContainerDatatypeSTL.scala
#	Compiler/src/exastencils/communication/ir/IR_LocalRecv.scala
#	Compiler/src/exastencils/communication/ir/IR_LocalSend.scala
#	Compiler/src/exastencils/communication/ir/IR_RemoteCommunicationFinish.scala
#	Compiler/src/exastencils/communication/ir/IR_RemoteCommunicationStart.scala
#	Compiler/src/exastencils/communication/ir/IR_RemoteSend.scala
#	Compiler/src/exastencils/timing/ir/IR_AutomaticFunctionTiming.scala
parents a782f71c 3f94f3a1
Showing
with 697 additions and 215 deletions
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