Skip to content
Snippets Groups Projects
Commit b5cf9056 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Merge remote-tracking branch 'heidy/devel' 

Conflicts:
	src/gui/mainwindow.cc
	src/gui/pythonwidget.cc
parents 17e958fb 9aa63ffd
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