Revision a3da8130 - Merge branch 'master' into ringzero+master Conflicts: doomsday/engine/po... - Doomsday Engine - Tracker

« Previous | Next »

Revision a3da8130

Added by danij about 13 years ago

ID a3da813041620382911c86bee1c7968f76a70c36
Parent 5a094973, 9223b60e
Child fdf9d5f0

Merge branch 'master' into ringzero+master

Conflicts:
doomsday/engine/portable/src/def_main.c
doomsday/engine/portable/src/r_lumobjs.c

Files

added
modified
copied
renamed
deleted