Revision 68dd253e - Merge branch 'cmake-build' into gl2-qopenglwindow Conflicts: doomsday/apps/... - Doomsday Engine - Tracker

« Previous | Next »

Revision 68dd253e

Added by skyjake over 9 years ago

ID 68dd253e2092f3fe83cc0bd63039f7e2e9f4b10f
Parent 591d8663, 1f6ede62
Child d25751ff

Merge branch 'cmake-build' into gl2-qopenglwindow

Conflicts:
doomsday/apps/client/src/gl/gl_main.cpp

Files

added
modified
copied
renamed
deleted