Revision ba6eadfc - Merge branch 'master' into defs-v2 Conflicts: distrib/win32/setup.iss.templ... - Doomsday Engine - Tracker

« Previous | Next »

Revision ba6eadfc

Added by skyjake over 10 years ago

ID ba6eadfc0ea120dcbfdd896ff5327898db0b94e0
Parent 87e0aa3f, 00bef567
Child eb77a291

Merge branch 'master' into defs-v2

Conflicts:
distrib/win32/setup.iss.template
doomsday/dep_sdl.pri
doomsday/libdoomsday/libdoomsday.pro

Files

added
modified
copied
renamed
deleted