krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/apps/opencs/model/settings
History
graffy76 f87eb67968 Fixed conflicts 
Merge branch 'cs-windows' of https://github.com/Glorf/openmw

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/model/settings/usersettings.hpp
	apps/opencs/view/settings/usersettingsdialog.cpp
2013-06-17 06:45:44 -05:00
..
settingcontainer.cpp Three primary changes: 2013-05-11 05:55:46 -05:00
settingcontainer.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
settingsitem.cpp Three primary changes: 2013-05-11 05:55:46 -05:00
settingsitem.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
support.cpp New file structure separating view classes from model classes. Deleted 2013-05-10 10:00:58 -05:00
support.hpp Three primary changes: 2013-05-11 05:55:46 -05:00
usersettings.cpp Fixed conflicts 2013-06-17 06:45:44 -05:00
usersettings.hpp Fixed conflicts 2013-06-17 06:45:44 -05:00