Project

General

Profile

« Previous | Next » 

Revision dbe222cb

Added by skyjake over 9 years ago

Merge branch 'master' into opengl3.3

Conflicts:
doomsday/libgui/include/de/gui/libgui.h
doomsday/libgui/src/graphics/glframebuffer.cpp
doomsday/libgui/src/graphics/gltarget.cpp

Files

  • added
  • modified
  • copied
  • renamed
  • deleted