Revision f8898e0b - Merge branch 'master' into mapdata-c++ Conflicts: doomsday/client/src/map/r_... - Doomsday Engine - Tracker

« Previous | Next »

Revision f8898e0b

Added by danij over 11 years ago

ID f8898e0b6d7585a619f44f6183df7f0afdb274d3
Parent d5aa73f4, 27adc40e
Child 45c4528a

Merge branch 'master' into mapdata-c++

Conflicts:
doomsday/client/src/map/r_world.cpp
doomsday/client/src/render/lumobj.cpp
doomsday/client/src/render/rend_main.cpp

Files

added
modified
copied
renamed
deleted