Revision d1d486a2 - Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine Conflicts:... - Doomsday Engine - Tracker

« Previous | Next »

Revision d1d486a2

Added by skyjake almost 12 years ago

ID d1d486a2e64a1878de069cee6cf69480917bf8bf
Parent a8a73d65, 0e821b1c
Child 120ba58e, fbace41a

Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine

Conflicts:
doomsday/engine/src/render/r_main.cpp
doomsday/engine/src/render/rend_main.cpp

Files

added
modified
copied
renamed
deleted