1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 06:49:55 +00:00
openmw-tes3mp/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 Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose 2013-03-08 20:08:56 -06:00
editor.hpp Merge remote-tracking branch 'graffy76/usersettings' 2013-05-16 18:04:55 +02:00
main.cpp fix for the opencs icon 2013-02-17 07:46:50 -06:00
ocspropertywidget.cpp update for master 2013-05-07 20:33:42 -05:00
ocspropertywidget.hpp update for master 2013-05-07 20:33:42 -05:00