Project

General

Profile

« Previous | Next » 

Revision 9858a72a

Added by skyjake almost 12 years ago

Merge branch 'master' into separate-server

Conflicts:
doomsday/engine/src/map/r_world.cpp
doomsday/engine/src/network/net_main.c
doomsday/engine/src/render/rend_main.cpp
doomsday/engine/src/resource/material.cpp
doomsday/engine/src/resource/materials.cpp

Files

  • added
  • modified
  • copied
  • renamed
  • deleted