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

Merge branch 'encapsulate' 

Conflicts:
	src/graphical-interface.impl.cpp
	src/graphical-interface.impl.hh
parents e29a3ba2 f95e2259
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1113 additions and 731 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