Commit graph

2 commits

Author SHA1 Message Date
Ryan Tucker
bf805813e5 Merge branch 'master' of https://github.com/OpenMW/openmw
# Conflicts:
#	docs/source/openmw-mods/index.rst
2016-12-19 21:06:36 -08:00
Ryan Tucker
cffd2bdd30 skeleton for full settings list 2016-10-18 21:46:55 -07:00