mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/ui/PreferencesDialog.cpp interface/src/ui/RunningScriptsWidget.cpp interface/ui/preferencesDialog.ui interface/ui/runningScriptsWidget.ui |
||
---|---|---|
.. | ||
chatWindow.ui | ||
console.ui | ||
loginDialog.ui | ||
preferencesDialog.ui | ||
runningScriptsWidget.ui | ||
scriptEditorWidget.ui | ||
scriptEditorWindow.ui | ||
shareSnapshot.ui | ||
updateDialog.ui |