Miloslav Číž c3d7ee5a9e Resolve merge conflicts		2018-06-13 08:22:37 +02:00
..
bsa
compiler	Resolve merge conflicts	2018-06-13 08:22:37 +02:00
config
contentselector	Merged pull request #1623	2018-06-09 10:49:04 +02:00
esm	Merged pull request #1477	2018-06-09 10:52:35 +02:00
esmterrain	remove indentation from blank lines	2018-06-09 10:31:51 -04:00
fallback
files
fontloader
interpreter	More consistent wording of errors/warnings	2017-03-04 21:48:31 +01:00
loadinglistener
misc	Revert "Don't force DDS file usage (fixes #1392)"	2018-06-04 17:08:09 +02:00
myguiplatform
nif	Fix assertion fail related to NiLookAtController	2018-06-09 17:07:38 +04:00
nifbullet
nifosg	Improve MRK NiStringExtraData handling (bug #4419)	2018-06-08 15:44:35 +04:00
process	OSX build fix	2014-11-20 18:14:49 +01:00
resource
sceneutil
sdlutil	remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb	2018-03-27 20:20:40 +02:00
settings
shader
terrain	Resolve merge conflicts	2018-06-13 08:22:37 +02:00
to_utf8
translation
version
vfs	Ignore duplicate data directories to work around the fallout of (Fixes #3557)	2018-01-14 00:25:20 +00:00
widgets	Fix warnings: catching polymorphic type by value	2018-06-02 14:28:46 +03:00
CMakeLists.txt	Resolve merge conflicts	2018-06-13 08:22:37 +02:00
doc.hpp