Revision ecd17f3e - Merge branch 'dsfluidsynth' of ssh://Air-Force.local/~jaakko/Projects/deng in... - Doomsday Engine - Tracker

« Previous | Next »

Revision ecd17f3e

Added by skyjake over 12 years ago

ID ecd17f3e8800361f004cbb123ca4516086a8fe29
Parent d10c8a94, 7b2c3776
Child c8263d48

Merge branch 'dsfluidsynth' of ssh://Air-Force.local/~jaakko/Projects/deng into dsfluidsynth

Conflicts:
doomsday/config.pri
doomsday/external/external.pro

Files

added
modified
copied
renamed
deleted