1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 06:45:32 +00:00
openmw-tes3mp/apps/opencs/view/settings
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
..
abstractblock.cpp Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
abstractblock.hpp Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
abstractpage.cpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
abstractpage.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
abstractwidget.cpp Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
abstractwidget.hpp Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
blankpage.cpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
blankpage.hpp Three primary changes: 2013-05-11 05:55:46 -05:00
customblock.cpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
customblock.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
editorpage.cpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
editorpage.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
groupblock.cpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
groupblock.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
groupbox.cpp Three primary changes: 2013-05-11 05:55:46 -05:00
groupbox.hpp Three primary changes: 2013-05-11 05:55:46 -05:00
itemblock.cpp Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
itemblock.hpp Three primary changes: 2013-05-11 05:55:46 -05:00
proxyblock.cpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
proxyblock.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
samplepage.cpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
samplepage.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
settingwidget.cpp New file structure separating view classes from model classes. Deleted 2013-05-10 10:00:58 -05:00
settingwidget.hpp Three primary changes: 2013-05-11 05:55:46 -05:00
support.cpp Three primary changes: 2013-05-11 05:55:46 -05:00
support.hpp Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
toggleblock.cpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
toggleblock.hpp Fixed / implemented missing features for RecordStatusDelegate 2013-06-15 06:40:18 -05:00
usersettingsdialog.cpp Fixed conflicts 2013-06-17 06:45:44 -05:00
usersettingsdialog.hpp Fixed conflicts 2013-06-17 06:45:44 -05:00
windowpage.cpp Feature #468 2013-06-09 00:34:27 +02:00
windowpage.hpp Feature #468 2013-06-09 00:34:27 +02:00