Merge branch 'master' into shadow-bias-c++
Conflicts:doomsday/client/include/render/rend_bias.hdoomsday/client/src/render/rend_bias.cppdoomsday/client/src/render/rend_main.cppdoomsday/client/src/world/world.cpp
Added by danij over 11 years ago
Added by
Merge branch 'master' into shadow-bias-c++
Conflicts:
doomsday/client/include/render/rend_bias.h
doomsday/client/src/render/rend_bias.cpp
doomsday/client/src/render/rend_main.cpp
doomsday/client/src/world/world.cpp