Merge branch 'master' into cmake-build
Conflicts: doomsday/apps/client/include/render/projector.h doomsday/apps/client/include/render/rend_dynlight.h doomsday/apps/client/include/render/rend_shadow.h doomsday/apps/client/include/render/vlight.h doomsday/apps/client/src/render/projector.cpp doomsday/apps/client/src/render/rend_dynlight.cpp doomsday/apps/client/src/render/rend_shadow.cpp doomsday/apps/client/src/render/vlight.cpp
Merge branch 'master' into cmake-build
Conflicts:
doomsday/apps/client/include/render/projector.h
doomsday/apps/client/include/render/rend_dynlight.h
doomsday/apps/client/include/render/rend_shadow.h
doomsday/apps/client/include/render/vlight.h
doomsday/apps/client/src/render/projector.cpp
doomsday/apps/client/src/render/rend_dynlight.cpp
doomsday/apps/client/src/render/rend_shadow.cpp
doomsday/apps/client/src/render/vlight.cpp