Merge branch 'master' of https://github.com/graffy76/openmw

Browse source

fixed conflict

Conflicts:
	apps/opencs/model/settings/usersettings.cpp

...

This commit is contained in:

graffy76 2014-05-03 19:49:01 -05:00

parent 0a3ab3dcd1 c4a9c18045

commit 306c9e840c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available