Revision 7689e2d2 - Merge branch 'master' into cmake-build Conflicts: doomsday/apps/plugins/com... - Doomsday Engine - Tracker

« Previous | Next »

Revision 7689e2d2

Added by skyjake over 9 years ago

ID 7689e2d2a18ca3710e1c6a39c2dcbd726b964223
Parent fad9c76e, f4ab2ee9
Child 7aa45a91

Merge branch 'master' into cmake-build

Conflicts:
doomsday/apps/plugins/common/src/acs/interpreter.cpp
doomsday/apps/plugins/common/src/acs/system.cpp

Files

added
modified
copied
renamed
deleted