Skip to content
Commit 8f94e9e9 authored by David Wiesner's avatar David Wiesner
Browse files

Merge branch 'locking-visualization' into multi-thread 

# Conflicts:
#	src/cell.cpp
#	src/cell.h
#	src/toolbox/regionlock.cpp
#	src/toolbox/report.cpp
#	src/toolbox/report.h
parents 59547b40 c01b4f0e
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