mirror of
https://github.com/Armored-Dragon/overte.git
synced 2025-03-11 16:13:16 +01: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 |