psi29a 18f5762a76 Merge branch 'master' into 'OpenCS-preserve-blocked' ... # Conflicts: # CHANGELOG.md		2021-09-18 15:20:26 +00:00
..
model	Merge branch 'master' into 'OpenCS-preserve-blocked'	2021-09-18 15:20:26 +00:00
view	Merge branch 'master' into 'OpenCS-preserve-blocked'	2021-09-18 15:20:26 +00:00
CMakeLists.txt	Remove redundant qt-related cmake macros	2021-09-17 14:41:04 +02:00
editor.cpp	Merge pull request #3018 from akortunov/emplace	2020-11-01 01:58:56 +03:00
editor.hpp	Issue #4202: Open .omwaddon files without needing to open openmw-cs first.	2019-07-02 16:07:38 +00:00
main.cpp	Fix string corruption with Qt on linux-systems	2021-01-18 19:21:02 +02:00