Merge branch 'master' into mapdata-c++
Conflicts:doomsday/client/include/render/lumobj.hdoomsday/client/src/map/blockmapvisual.cppdoomsday/client/src/map/gamemap.cppdoomsday/client/src/render/rend_bias.cppdoomsday/client/src/render/rend_main.cppdoomsday/client/src/resource/material.cpp
Added by danij over 11 years ago
Added by
Merge branch 'master' into mapdata-c++
Conflicts:
doomsday/client/include/render/lumobj.h
doomsday/client/src/map/blockmapvisual.cpp
doomsday/client/src/map/gamemap.cpp
doomsday/client/src/render/rend_bias.cpp
doomsday/client/src/render/rend_main.cpp
doomsday/client/src/resource/material.cpp