7 commits

Author	SHA1	Message	Date
Bret Curtis	3f9b36dc3d	Merge branch 'master' into patch-2	2016-12-13 21:57:54 +01:00
jeffreyhaines	829f684899	Removed Oxford comma	2016-12-13 15:39:30 -05:00
jeffreyhaines	6fadcc6748	Replaced "prior" with "previous"	2016-12-13 13:29:22 -05:00
jeffreyhaines	2fe2b57faa	Replaced choose with select	2016-12-13 13:27:43 -05:00
jeffreyhaines	d95a663510	Minor grammar and sentence changes	2016-12-13 11:11:21 -05:00
jeffreyhaines	2d928fac36	Minor spelling correction	2016-12-13 10:46:16 -05:00
Bret Curtis	7f0d5bde2d	make conf.py independant from cmake macros ... merged openmw-cs in, using per directory statics add requirements.txt for sphinx docs it is breath update gitignore and openmw-cs	2016-07-29 18:14:54 +02:00