Revision 49d84693 - Merge branch 'master' into qapp-based Conflicts: doomsday/engine/engine.pro... - Doomsday Engine - Tracker

« Previous | Next »

Revision 49d84693

Added by skyjake over 12 years ago

ID 49d84693367d16997dc94e041d7928217da40998
Parent 596b87d7, 770cb763
Child a3a23941

Merge branch 'master' into qapp-based

Conflicts:
doomsday/engine/engine.pro
doomsday/engine/portable/include/con_main.h
doomsday/engine/portable/include/dd_main.h

Files

added
modified
copied
renamed
deleted