Merge branch 'master' into revise-texture-animation
Conflicts:doomsday/client/include/dd_main.hdoomsday/client/src/dd_main.cppdoomsday/client/src/map/r_world.cppdoomsday/client/src/ui/ui2_main.cpp
Added by danij almost 12 years ago
Added by
Merge branch 'master' into revise-texture-animation
Conflicts:
doomsday/client/include/dd_main.h
doomsday/client/src/dd_main.cpp
doomsday/client/src/map/r_world.cpp
doomsday/client/src/ui/ui2_main.cpp