1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 15:39:02 +00:00
OpenMW/apps/opencs
graffy76 9ce4a04a2d merge from saving
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
2013-10-25 14:44:22 -05:00
..
model some fixes for the merged filter branch 2013-10-21 19:28:57 +02:00
view merge from saving 2013-10-25 14:44:22 -05:00
CMakeLists.txt merge from saving 2013-10-25 14:44:22 -05:00
editor.cpp merge from saving 2013-10-25 14:44:22 -05:00
editor.hpp
main.cpp