Revision 67ccf71f - Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine into oculus... - Doomsday Engine - Tracker

« Previous | Next »

Revision 67ccf71f

Added by skyjake over 10 years ago

ID 67ccf71f5ded8275191837e6c654dc66a98fbf3f
Parent 9b89dcd8, 827f8ed4
Child 64a8b858

Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine into oculus-rift-dk2

Conflicts:
doomsday/config_unix_any.pri

Files

added
modified
copied
renamed
deleted