mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-13 13:07:23 +02:00
Conflicts: interface/src/Application.cpp interface/src/ui/FramelessDialog.cpp interface/src/ui/FramelessDialog.h |
||
---|---|---|
.. | ||
chatWindow.ui | ||
loginDialog.ui | ||
preferencesDialog.ui | ||
runningScriptsWidget.ui | ||
scriptEditorWidget.ui | ||
scriptEditorWindow.ui | ||
updateDialog.ui |