Commit Graph

4 Commits (openmw-39)

Author SHA1 Message Date
Marek Kochanowicz ae5e8b95ff Solving Issue912 11 years ago
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
12 years ago
graffy76 a5d9d3fd7a Updated status icons from sirherrbatka 12 years ago
graffy76 94db7cdcfe Added png's of icons 12 years ago