Skip to content
Snippets Groups Projects
Commit f3d17027 authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

Merge branch 'FancyMainWindow' into RealSpaceDock 

# Conflicts:
#	GUI/coregui/Views/SampleDesigner/ScriptPanel.cpp
parents 17a81074 ccc41189
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 460 additions and 200 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment