Brad Davis 8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android		2018-01-22 15:07:30 -08:00
..
ui	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
CursorManager.cpp
CursorManager.h
DesktopPreviewProvider.cpp	make gcc happy	2018-01-19 01:51:41 +00:00
DesktopPreviewProvider.h	make gcc happy	2018-01-19 01:51:41 +00:00
ErrorDialog.cpp
ErrorDialog.h
FileDialogHelper.cpp
FileDialogHelper.h
InfoView.cpp	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
InfoView.h
MainWindow.cpp
MainWindow.h
OffscreenQmlDialog.cpp
OffscreenQmlDialog.h
OffscreenQmlElement.h	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
OffscreenUi.cpp	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
OffscreenUi.h	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
QmlWebWindowClass.cpp
QmlWebWindowClass.h
QmlWindowClass.cpp	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
QmlWindowClass.h	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
Tooltip.cpp
Tooltip.h
VrMenu.cpp	New android toolchain	2017-09-19 13:45:12 -07:00
VrMenu.h