Revision 853c29f6 - Merge branch 'master' into material-cleanup Conflicts: doomsday/engine/src/r... - Doomsday Engine - Tracker

« Previous | Next »

Revision 853c29f6

Added by danij almost 12 years ago

ID 853c29f6336a92c3815b5589a7be620e06b41640
Parent b7a6ad6c, f6dfe937
Child 0e821b1c

Merge branch 'master' into material-cleanup

Conflicts:
doomsday/engine/src/render/r_main.cpp
doomsday/engine/src/resource/materials.cpp

Files

added
modified
copied
renamed
deleted