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
..
doc	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-16 18:04:55 +02:00
settings	Fixed conflicts	2013-06-17 06:45:44 -05:00
tools	added verifier for spell record	2013-04-09 12:44:49 +02:00
world	Fixed / implemented missing features for RecordStatusDelegate	2013-06-15 06:40:18 -05:00