Commit graph

55 commits

Author SHA1 Message Date
David Rowe
997dc963d3 Merge branch 'master' into M22147 2019-05-15 07:59:10 +12:00
danteruiz
0fae615cb4 fix dock widget context 2019-05-09 09:20:50 -07:00
David Rowe
302e876857 Update InteractiveWindow JSDoc per changes in master 2019-05-09 10:26:16 +12:00
David Rowe
414f27208d Merge branch 'master' into M22147
# Conflicts:
#	interface/src/scripting/DesktopScriptingInterface.h
#	interface/src/ui/InteractiveWindow.h
2019-05-09 08:43:05 +12:00
danteruiz
3806631bf1 dockable window 2019-05-08 10:04:31 -07:00
Renamed from libraries/ui/src/InteractiveWindow.cpp (Browse further)