Revision 749e3ec8 - Merge branch 'cmake-build' into gl2-qopenglwindow Conflicts: doomsday/sdk/l... - Doomsday Engine - Tracker

« Previous | Next »

Revision 749e3ec8

Added by skyjake over 9 years ago

ID 749e3ec870763090095fa511caa6c146b7ac6723
Parent 65e81632, 1ee4e51f
Child ec35a7e1

Merge branch 'cmake-build' into gl2-qopenglwindow

Conflicts:
doomsday/sdk/libappfw/src/vrwindowtransform.cpp

Files

added
modified
copied
renamed
deleted