Revision 5374534c - Merge branch 'master' of github.com:skyjake/Doomsday-Engine into ui-alerts C... - Doomsday Engine - Tracker

« Previous | Next »

Revision 5374534c

Added by skyjake almost 11 years ago

ID 5374534c2689bb88fb0c28445a9a90ffd01bd024
Parent 24524fdf, a336ba83
Child 1cb02e79

Merge branch 'master' of github.com:skyjake/Doomsday-Engine into ui-alerts

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

Files

added
modified
copied
renamed
deleted