Revision bb800b6e - Merge branch 'master' into remove-sdlnet Conflicts: distrib/platform_releas... - Doomsday Engine - Tracker

« Previous | Next »

Revision bb800b6e

Added by skyjake about 13 years ago

ID bb800b6eadf1027392645e4b7d95ba5357a2f09a
Parent 355defd2, e6c68c5c
Child 5906ce4f

Merge branch 'master' into remove-sdlnet

Conflicts:
distrib/platform_release.py
doomsday/build/build.pro
doomsday/config.pri

Files

added
modified
copied
renamed
deleted