1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 15:39:02 +00:00
OpenMW/apps/opencs
Marc Zinnschlag 54f56b0515 Merge remote-tracking branch 'graffy76/usersettings'
Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp
2013-05-16 18:04:55 +02:00
..
model Merge remote-tracking branch 'graffy76/usersettings' 2013-05-16 18:04:55 +02:00
view Merge remote-tracking branch 'graffy76/usersettings' 2013-05-16 18:04:55 +02:00
CMakeLists.txt Merge remote-tracking branch 'graffy76/usersettings' 2013-05-16 18:04:55 +02:00
editor.cpp
editor.hpp Merge remote-tracking branch 'graffy76/usersettings' 2013-05-16 18:04:55 +02:00
main.cpp
ocspropertywidget.cpp
ocspropertywidget.hpp