mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 15:39:02 +00:00
Code Issues Projects Releases Wiki Activity
96eb8d7be9
OpenMW/apps/opencs
History
AnyOldName3 8fc09f8c51 Merge remote-tracking branch 'upstream/master' into detain-hash-selectively-reluctant 
Merge conflicts included:
* One setting being removed (branch had changed its type).
* One setting's description being changed (branch had changed its type).
* List of files in components/files was changed both upstream and on the
  branch.
* Upstream had changed something in a file the branch deletes.
2021-12-09 17:09:52 +00:00
..
model Allow the CS to handle the repeat flag for all types 2021-11-20 11:03:08 +01:00
view Merge branch 'circular' into 'master' 2021-11-14 20:24:18 +00:00
CMakeLists.txt use OPENMW_RESOURCES_ROOT instead 2021-12-08 14:33:49 +01:00
editor.cpp Merge remote-tracking branch 'upstream/master' into detain-hash-selectively-reluctant 2021-12-09 17:09:52 +00:00
editor.hpp
main.cpp